use String instead of Symbol

Symbol literal deprecated since Scala 2.13

Author: xuwei-k

core/src/test/scala/parameterbinderfactory/AccountSpec.scala

@@ -34,7 +34,7 @@ class AccountSpec extends FlatSpec with Matchers with DBSettings with Logging {
 
   it should "insert person with custom binder sync" in {
 
-    val result: Int = NamedDB('mysql).autoCommit { implicit s =>
+    val result: Int = NamedDB("mysql").autoCommit { implicit s =>
       withSQL {
         insert.into(Person).namedValues(
           personColumn.id -> personId,
@@ -45,7 +45,7 @@ class AccountSpec extends FlatSpec with Matchers with DBSettings with Logging {
   }
 
   it should "insert account with custom binder async" in {
-    val resultsFuture: Future[Int] = NamedAsyncDB('mysql).withPool { implicit s =>
+    val resultsFuture: Future[Int] = NamedAsyncDB("mysql").withPool { implicit s =>
       withSQL {
         insert.into(Account).namedValues(
           accountColumn.id -> accountId,
@@ -58,7 +58,7 @@ class AccountSpec extends FlatSpec with Matchers with DBSettings with Logging {
   }
 
   it should "insert account with custom binder with parent set to Some async" in {
-    val resultsFuture: Future[Int] = NamedAsyncDB('mysql).withPool { implicit s =>
+    val resultsFuture: Future[Int] = NamedAsyncDB("mysql").withPool { implicit s =>
       withSQL {
         insert.into(Account).namedValues(
           accountColumn.id -> accountId2,
@@ -73,7 +73,7 @@ class AccountSpec extends FlatSpec with Matchers with DBSettings with Logging {
 
   it should "select person joining account with custom binder sync" in {
 
-    val result: Option[PersonWithAccounts] = NamedDB('mysql).readOnly { implicit s =>
+    val result: Option[PersonWithAccounts] = NamedDB("mysql").readOnly { implicit s =>
       withSQL {
         selectFrom(Person as p).join(Account as acc).on(p.id, acc.personId)
           .where.eq(p.id, personId)
@@ -89,7 +89,7 @@ class AccountSpec extends FlatSpec with Matchers with DBSettings with Logging {
 
   it should "select person joining account with custom binder async" in {
 
-    val resultFuture: Future[Option[PersonWithAccounts]] = NamedAsyncDB('mysql).withPool { implicit s =>
+    val resultFuture: Future[Option[PersonWithAccounts]] = NamedAsyncDB("mysql").withPool { implicit s =>
       withSQL {
         selectFrom(Person as p).join(Account as acc).on(p.id, acc.personId)
           .where.eq(p.id, personId)
@@ -105,7 +105,7 @@ class AccountSpec extends FlatSpec with Matchers with DBSettings with Logging {
   }
 
   it should "select account joining person with custom binder sync" in {
-    val result: Option[AccountAndPerson] = NamedDB('mysql).readOnly { implicit s =>
+    val result: Option[AccountAndPerson] = NamedDB("mysql").readOnly { implicit s =>
       withSQL {
         selectFrom(Account as acc)
           .join(Person as p)
@@ -123,7 +123,7 @@ class AccountSpec extends FlatSpec with Matchers with DBSettings with Logging {
   }
 
   it should "select account joining person with custom binder async" in {
-    val resultsFuture: Future[Option[AccountAndPerson]] = NamedAsyncDB('mysql).withPool { implicit s =>
+    val resultsFuture: Future[Option[AccountAndPerson]] = NamedAsyncDB("mysql").withPool { implicit s =>
       withSQL {
         selectFrom(Account as acc)
           .join(Person as p)

core/src/test/scala/parameterbinderfactory/PersonSpec.scala

@@ -18,7 +18,7 @@ class PersonSpec extends FlatSpec with Matchers with DBSettings with Logging {
 
   it should "insert person with custom binder sync" in {
 
-    val result: Int = NamedDB('mysql).autoCommit { implicit s =>
+    val result: Int = NamedDB("mysql").autoCommit { implicit s =>
       withSQL {
         insert.into(Person).namedValues(
           column.id -> PersonId(1),
@@ -29,7 +29,7 @@ class PersonSpec extends FlatSpec with Matchers with DBSettings with Logging {
   }
 
   it should "insert person with custom binder async" in {
-    val resultsFuture: Future[Int] = NamedAsyncDB('mysql).withPool { implicit s =>
+    val resultsFuture: Future[Int] = NamedAsyncDB("mysql").withPool { implicit s =>
       withSQL {
         insert.into(Person).namedValues(
           column.id -> PersonId(2),
@@ -44,7 +44,7 @@ class PersonSpec extends FlatSpec with Matchers with DBSettings with Logging {
     val id = PersonId(12)
     val name = "testperson"
 
-    val result: Option[Person] = NamedDB('mysql).readOnly { implicit s =>
+    val result: Option[Person] = NamedDB("mysql").readOnly { implicit s =>
       withSQL {
         selectFrom(Person as p).where.eq(p.id, id)
       }.map(Person(p)).single.apply()
@@ -56,7 +56,7 @@ class PersonSpec extends FlatSpec with Matchers with DBSettings with Logging {
     val id = PersonId(12)
     val name = "testperson"
 
-    val resultsFuture: Future[Option[Person]] = NamedAsyncDB('mysql).withPool { implicit s =>
+    val resultsFuture: Future[Option[Person]] = NamedAsyncDB("mysql").withPool { implicit s =>
       withSQL {
         selectFrom(Person as p).where.eq(p.id, id)
       }.map(Person(p)).single.future()
@@ -67,7 +67,7 @@ class PersonSpec extends FlatSpec with Matchers with DBSettings with Logging {
 
   it should "update person with custom binder sync" in {
 
-    val result: Int = NamedDB('mysql).autoCommit { implicit s =>
+    val result: Int = NamedDB("mysql").autoCommit { implicit s =>
       withSQL {
         update(Person).set(
           column.id -> PersonId(3),
@@ -79,7 +79,7 @@ class PersonSpec extends FlatSpec with Matchers with DBSettings with Logging {
 
   it should "update person with custom binder async" in {
 
-    val resultsFuture: Future[Int] = NamedAsyncDB('mysql).withPool { implicit s =>
+    val resultsFuture: Future[Int] = NamedAsyncDB("mysql").withPool { implicit s =>
       withSQL {
         update(Person).set(
           column.id -> PersonId(4),
@@ -93,7 +93,7 @@ class PersonSpec extends FlatSpec with Matchers with DBSettings with Logging {
 
   it should "delete person with custom binder sync" in {
 
-    val result: Int = NamedDB('mysql).autoCommit { implicit s =>
+    val result: Int = NamedDB("mysql").autoCommit { implicit s =>
       withSQL {
         deleteFrom(Person).where.eq(column.id, PersonId(3))
       }.update.apply()
@@ -103,7 +103,7 @@ class PersonSpec extends FlatSpec with Matchers with DBSettings with Logging {
 
   it should "delete person with custom binder async" in {
 
-    val resultsFuture: Future[Int] = NamedAsyncDB('mysql).withPool { implicit s =>
+    val resultsFuture: Future[Int] = NamedAsyncDB("mysql").withPool { implicit s =>
       withSQL {
         deleteFrom(Person).where.eq(column.id, PersonId(4))
       }.update.future()

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

@@ -15,7 +15,7 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
   val al = AsyncLover.syntax("al")
 
   it should "select a single value" in {
-    val id = NamedDB('mysql).autoCommit { implicit s =>
+    val id = NamedDB("mysql").autoCommit { implicit s =>
       withSQL {
         insert.into(AsyncLover).namedValues(
           column.name -> "Eric",
@@ -24,15 +24,15 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
           column.createdAt -> createdTime)
       }.updateAndReturnGeneratedKey.apply()
     }
-    val resultFuture: Future[Option[AsyncLover]] = NamedAsyncDB('mysql).withPool { implicit s =>
+    val resultFuture: Future[Option[AsyncLover]] = NamedAsyncDB("mysql").withPool { implicit s =>
       withSQL { select.from(AsyncLover as al).where.eq(al.id, id) }.map(AsyncLover(al)).single.future()
     }
     val result = Await.result(resultFuture, 5.seconds)
     result.isDefined should be(true)
   }
 
   it should "select values as a Iterable" in {
-    val resultsFuture: Future[Iterable[AsyncLover]] = NamedAsyncDB('mysql).withPool { implicit s =>
+    val resultsFuture: Future[Iterable[AsyncLover]] = NamedAsyncDB("mysql").withPool { implicit s =>
       withSQL {
         select.from(AsyncLover as al)
           .where.isNotNull(al.birthday) // mysql-async 0.2.4 cannot parse nullable date value.
@@ -44,7 +44,7 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
   }
 
   it should "select values as a List" in {
-    val resultsFuture: Future[List[AsyncLover]] = NamedAsyncDB('mysql).withPool { implicit s =>
+    val resultsFuture: Future[List[AsyncLover]] = NamedAsyncDB("mysql").withPool { implicit s =>
       withSQL {
         select.from(AsyncLover as al)
           .where.isNotNull(al.birthday) // mysql-async 0.2.4 cannot parse nullable date value.
@@ -56,7 +56,7 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
   }
 
   it should "read values with convenience methods" in {
-    val generatedIdFuture: Future[Long] = NamedAsyncDB('mysql).withPool { implicit s =>
+    val generatedIdFuture: Future[Long] = NamedAsyncDB("mysql").withPool { implicit s =>
       withSQL {
         insert.into(AsyncLover).namedValues(
           column.name -> "Eric",
@@ -67,7 +67,7 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
     }
     // in AsyncLover#apply we are using get with typebinders, specialized getters should work
     val generatedId = Await.result(generatedIdFuture, 5.seconds)
-    val created = NamedDB('mysql).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.get[Long](al.resultName.id),
@@ -87,7 +87,7 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
   }
 
   it should "return generated key" in {
-    val generatedIdFuture: Future[Long] = NamedAsyncDB('mysql).withPool { implicit s =>
+    val generatedIdFuture: Future[Long] = NamedAsyncDB("mysql").withPool { implicit s =>
       withSQL {
         insert.into(AsyncLover).namedValues(
           column.name -> "Eric",
@@ -99,7 +99,7 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
     }
     // the generated key should be found
     val generatedId = Await.result(generatedIdFuture, 5.seconds)
-    val created = NamedDB('mysql).readOnly { implicit s =>
+    val created = NamedDB("mysql").readOnly { implicit s =>
       withSQL { select.from(AsyncLover as al).where.eq(al.id, generatedId) }.map(AsyncLover(al)).single.apply()
     }.get
     created.id should equal(generatedId)
@@ -111,7 +111,7 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
 
   it should "update" in {
     // updating queries should be successful
-    NamedDB('mysql) autoCommit { implicit s =>
+    NamedDB("mysql") autoCommit { implicit s =>
       withSQL { delete.from(AsyncLover).where.eq(column.id, 1004) }.update.apply()
       withSQL {
         insert.into(AsyncLover).namedValues(
@@ -122,21 +122,21 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
           column.createdAt -> createdTime)
       }.update.apply()
     }
-    val deletion: Future[Int] = NamedAsyncDB('mysql).withPool { implicit s =>
+    val deletion: Future[Int] = NamedAsyncDB("mysql").withPool { implicit s =>
       withSQL { delete.from(AsyncLover).where.eq(column.id, 1004) }.update.future()
     }
     Await.result(deletion, 5.seconds)
 
     // should be committed
-    val deleted = NamedDB('mysql).readOnly { implicit s =>
+    val deleted = NamedDB("mysql").readOnly { implicit s =>
       withSQL { select.from(AsyncLover as al).where.eq(al.id, 1004) }.map(AsyncLover(al)).single.apply()
     }
     deleted.isDefined should be(false)
   }
 
   it should "execute" in {
     // execution should be successful
-    val id = NamedDB('mysql).autoCommit { implicit s =>
+    val id = NamedDB("mysql").autoCommit { implicit s =>
       withSQL {
         insert.into(AsyncLover).namedValues(
           column.name -> "Chris",
@@ -145,13 +145,13 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
           column.createdAt -> createdTime)
       }.updateAndReturnGeneratedKey.apply()
     }
-    val deletion: Future[Boolean] = NamedAsyncDB('mysql).withPool { implicit s =>
+    val deletion: Future[Boolean] = NamedAsyncDB("mysql").withPool { implicit s =>
       withSQL { delete.from(AsyncLover).where.eq(column.id, id) }.execute.future()
     }
     Await.result(deletion, 5.seconds)
 
     // should be committed
-    val deleted = NamedDB('mysql).readOnly { implicit s =>
+    val deleted = NamedDB("mysql").readOnly { implicit s =>
       withSQL { select.from(AsyncLover as al).where.eq(al.id, id) }.map(AsyncLover(al)).single.apply()
     }
     deleted.isDefined should be(false)
@@ -160,7 +160,7 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
   it should "update in a local transaction" in {
     (1 to 10).foreach { _ =>
 
-      val generatedIdFuture: Future[Long] = NamedAsyncDB('mysql).localTx { implicit tx =>
+      val generatedIdFuture: Future[Long] = NamedAsyncDB("mysql").localTx { implicit tx =>
         withSQL(insert.into(AsyncLover).namedValues(
           column.name -> "Patric",
           column.rating -> 2,
@@ -169,7 +169,7 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
         ).updateAndReturnGeneratedKey.future
       }
       val generatedId = Await.result(generatedIdFuture, 5.seconds)
-      val created = NamedDB('mysql).readOnly { implicit s =>
+      val created = NamedDB("mysql").readOnly { implicit s =>
         withSQL { select.from(AsyncLover as al).where.eq(al.id, generatedId) }.map(AsyncLover(al)).single.apply()
       }.get
       created.id should equal(generatedId)
@@ -183,10 +183,10 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
   it should "rollback in a local transaction" in {
     (1 to 10).foreach { _ =>
 
-      NamedDB('mysql).autoCommit { implicit s =>
+      NamedDB("mysql").autoCommit { implicit s =>
         withSQL { delete.from(AsyncLover).where.eq(column.id, 1003) }.update.apply()
       }
-      val failureFuture: Future[Unit] = NamedAsyncDB('mysql).localTx { implicit tx =>
+      val failureFuture: Future[Unit] = NamedAsyncDB("mysql").localTx { implicit tx =>
         import FutureImplicits._
         for {
           _ <- insert.into(AsyncLover).namedValues(
@@ -208,7 +208,7 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
       failureFuture.value.get.isFailure should be(true)
 
       // should be rolled back
-      val notCreated = NamedDB('mysql).readOnly { implicit s =>
+      val notCreated = NamedDB("mysql").readOnly { implicit s =>
         withSQL { select.from(AsyncLover as al).where.eq(al.id, 1003) }.map(AsyncLover(al)).single.apply()
       }
       notCreated.isDefined should be(false)
@@ -218,7 +218,7 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
   it should "provide transaction by AsyncTx.withSQLBuilders" in {
     (1 to 10).foreach { _ =>
 
-      val deletionAndCreation: Future[Seq[AsyncQueryResult]] = NamedAsyncDB('mysql).withPool { implicit s =>
+      val deletionAndCreation: Future[Seq[AsyncQueryResult]] = NamedAsyncDB("mysql").withPool { implicit s =>
         AsyncTx.withSQLBuilders(
           delete.from(AsyncLover).where.eq(column.id, 997),
           insert.into(AsyncLover).namedValues(
@@ -233,7 +233,7 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
       deletionAndCreation.value.get.get.size should be(2)
 
       // should be found
-      val created = NamedDB('mysql).readOnly { implicit s =>
+      val created = NamedDB("mysql").readOnly { implicit s =>
         withSQL { select.from(AsyncLover as al).where.eq(al.id, 997) }.map(AsyncLover(al)).single.apply()
       }.get
       created.id should equal(997)
@@ -247,10 +247,10 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
   it should "provide transactional deletion by AsyncTx.withSQLBuilders" in {
     (1 to 10).foreach { _ =>
 
-      NamedDB('mysql).autoCommit { implicit s =>
+      NamedDB("mysql").autoCommit { implicit s =>
         withSQL { delete.from(AsyncLover).where.eq(column.id, 998) }.update.apply()
       }
-      val creationAndDeletion: Future[Seq[AsyncQueryResult]] = NamedAsyncDB('mysql).withPool { implicit s =>
+      val creationAndDeletion: Future[Seq[AsyncQueryResult]] = NamedAsyncDB("mysql").withPool { implicit s =>
         AsyncTx.withSQLBuilders(
           insert.into(AsyncLover).namedValues(
             column.id -> 998,
@@ -265,7 +265,7 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
       creationAndDeletion.value.get.get.size should be(2)
 
       // should be committed
-      val deleted = NamedDB('mysql).readOnly { implicit s =>
+      val deleted = NamedDB("mysql").readOnly { implicit s =>
         withSQL { select.from(AsyncLover as al).where.eq(al.id, 998) }.map(AsyncLover(al)).single.apply()
       }
       deleted.isDefined should be(false)
@@ -275,7 +275,7 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
   it should "rollback in a transaction when using AsyncTx.withSQLs" in {
     (1 to 10).foreach { _ =>
 
-      val failure: Future[Seq[AsyncQueryResult]] = NamedAsyncDB('mysql).withPool { implicit s =>
+      val failure: Future[Seq[AsyncQueryResult]] = NamedAsyncDB("mysql").withPool { implicit s =>
         AsyncTx.withSQLs(
           insert.into(AsyncLover).namedValues(
             column.id -> 999,
@@ -294,7 +294,7 @@ class MySQLSampleSpec extends FlatSpec with Matchers with DBSettings with Loggin
       }
       failure.value.get.isSuccess should be(false)
 
-      val notFound = NamedDB('mysql).readOnly { implicit s =>
+      val notFound = NamedDB("mysql").readOnly { implicit s =>
         withSQL { select.from(AsyncLover as al).where.eq(al.id, 999) }.map(AsyncLover(al)).single.apply()
       }
       notFound.isDefined should be(false)

core/src/test/scala/unit/AccountDBInitializer.scala

@@ -18,7 +18,7 @@ create table account (
         values (13, 12, 'test account details', null)""")
 
   def initMySQL(): Unit = {
-    NamedDB('mysql) autoCommit { implicit s =>
+    NamedDB("mysql") autoCommit { implicit s =>
       try sql"drop table account".execute.apply()
       catch { case e: Exception => }
 

core/src/test/scala/unit/DBSettings.scala

@@ -22,8 +22,8 @@ trait DBSettings extends ForAllTestContainer { self: Suite =>
     PgListDBInitializer.initPostgreSQL()
 
     // MySQL
-    ConnectionPool.add(Symbol("mysql"), url = mysql.jdbcUrl, user = mysql.username, password = mysql.password)
-    AsyncConnectionPool.add(Symbol("mysql"), url = mysql.jdbcUrl, user = mysql.username, password = mysql.password)
+    ConnectionPool.add("mysql", url = mysql.jdbcUrl, user = mysql.username, password = mysql.password)
+    AsyncConnectionPool.add("mysql", url = mysql.jdbcUrl, user = mysql.username, password = mysql.password)
 
     SampleDBInitializer.initMySQL()
     PgListDBInitializer.initMySQL()

core/src/test/scala/unit/PersonDBInitializer.scala

@@ -16,7 +16,7 @@ create table person (
         values (12, 'testperson')""")
 
   def initMySQL(): Unit = {
-    NamedDB('mysql) autoCommit { implicit s =>
+    NamedDB("mysql") autoCommit { implicit s =>
       try sql"drop table person".execute.apply()
       catch { case e: Exception => }
 

core/src/test/scala/unit/PgListDBInitializer.scala

@@ -88,7 +88,7 @@ insert into programmer_skill values (2, 2);
   }
 
   def initMySQL(): Unit = {
-    NamedDB('mysql) autoCommit { implicit s =>
+    NamedDB("mysql") autoCommit { implicit s =>
 
       try sql"drop table programmer_skill".execute.apply()
       catch { case e: Exception => log.debug(e.getMessage, e) }