Merge pull request #33 from sainaen/fix_sample_specs

Fix core's sample specs

Author: seratch

core/src/test/scala/sample/MySQLSampleSpec.scala

@@ -54,18 +54,18 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
   }
 
   it should "read values with convenience methods" in {
-    val generatedIdFuture: Future[Long] = AsyncDB.withPool { implicit s =>
+    val generatedIdFuture: Future[Long] = NamedAsyncDB('mysql).withPool { implicit s =>
       withSQL {
         insert.into(AsyncLover).namedValues(
           column.name -> "Eric",
           column.rating -> 2,
           column.isReactive -> false,
-          column.createdAt -> createdTime).returningId
+          column.createdAt -> createdTime)
       }.updateAndReturnGeneratedKey.future()
     }
     // in AsyncLover#apply we are using get with typebinders, specialized getters should work
     val generatedId = Await.result(generatedIdFuture, 5.seconds)
-    val created = DB.readOnly { implicit s =>
+    val created = NamedDB('mysql).readOnly { implicit s =>
       withSQL { select.from(AsyncLover as al).where.eq(al.id, generatedId) }.map((rs: WrappedResultSet) => {
         AsyncLover(
           id = rs.long(al.resultName.id),
@@ -109,7 +109,7 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
 
   it should "update" in {
     // updating queries should be successful
-    DB autoCommit { implicit s =>
+    NamedDB('mysql) autoCommit { implicit s =>
       withSQL { delete.from(AsyncLover).where.eq(column.id, 1004) }.update.apply()
       withSQL {
         insert.into(AsyncLover).namedValues(

core/src/test/scala/sample/PostgreSQLSampleSpec.scala

@@ -2,7 +2,6 @@ package sample
 
 import org.joda.time._
 import org.scalatest._
-import org.slf4j.LoggerFactory
 import scala.concurrent._, duration.DurationInt, ExecutionContext.Implicits.global
 import scalikejdbc._, async._
 import unit._
@@ -119,7 +118,7 @@ class PostgreSQLSampleSpec extends FlatSpec with Matchers with DBSettings with L
     Await.result(deletion, 5.seconds)
 
     // should be committed
-    val deleted = NamedDB('mysql).readOnly { implicit s =>
+    val deleted = DB.readOnly { implicit s =>
       withSQL { select.from(AsyncLover as al).where.eq(al.id, 1004) }.map(AsyncLover(al)).single.apply()
     }
     deleted.isDefined should be(false)

project/Build.scala

@@ -5,7 +5,7 @@ object ScalikeJDBCAsyncProject extends Build {
 
   lazy val _version = "0.6.0-SNAPSHOT"
   lazy val scalikejdbcVersion = "2.2.9"
-  lazy val mauricioVersion = "0.2.+" // provided
+  lazy val mauricioVersion = "0.2.18" // provided
   lazy val postgresqlVersion = "9.4-1201-jdbc41"
   lazy val defaultPlayVersion = play.core.PlayVersion.current