Revert "Revert "GAWB-1788 Upgrade to Slick 3.2 (#178)" (#179)"

This reverts commit 7ee59eb.

Author: helgridly

build.sbt

@@ -26,7 +26,7 @@ libraryDependencies ++= Seq(
   "com.typesafe.akka" %% "akka-slf4j" % "2.3.11",
   "com.typesafe" % "config" % "1.2.1",
   "com.typesafe.scala-logging" %% "scala-logging-slf4j" % "2.1.2",
-  "com.typesafe.slick" %% "slick" % "3.0.0",
+  "com.typesafe.slick" %% "slick" % "3.2.0",
   "com.zaxxer" % "HikariCP" % "2.3.9",
   "io.spray" %% "spray-can" % sprayV,
   "io.spray" %% "spray-client" % sprayV,

src/main/resources/reference.conf

@@ -49,17 +49,23 @@ akka {
 
 // MySQL example
 //sqlDatabase = {
-//  url = "jdbc:mysql://DB_HOST:DB_PORT/DB_NAME"
-//  driver = com.mysql.jdbc.Driver
-//  user = DB_USER
-//  password = DB_PASSWORD
+//  profile = "slick.jdbc.MySQLProfile$"
+//  db {
+//    url = "jdbc:mysql://DB_HOST:DB_PORT/DB_NAME"
+//    driver = "com.mysql.jdbc.Driver"
+//    user = DB_USER
+//    password = DB_PASSWORD
+//  }
 //}
 
 // H2 example
 sqlDatabase = {
-  url = "jdbc:h2:file:local"
-  user = root
-  driver = org.h2.Driver
-  connectionPool = disabled
-  keepAliveConnection = true
+  profile = "slick.jdbc.H2Profile$"
+  db {
+    connectionPool = disabled
+    driver = "org.h2.Driver"
+    url = "jdbc:h2:file:local"
+    keepAliveConnection = true
+    user = root
+  }
 }

src/main/scala/org/broadinstitute/dsde/agora/server/AgoraConfig.scala

@@ -5,7 +5,8 @@ import net.ceedubs.ficus.Ficus._
 import org.broadinstitute.dsde.agora.server.model.AgoraEntityType
 import org.broadinstitute.dsde.agora.server.model.AgoraEntityType.EntityType
 import org.broadinstitute.dsde.agora.server.webservice.routes.{AgoraDirectives, MockAgoraDirectives, OpenIdConnectDirectives}
-import slick.jdbc.JdbcBackend.Database
+import slick.basic.DatabaseConfig
+import slick.jdbc.JdbcProfile
 
 object AgoraConfig {
 
@@ -55,7 +56,7 @@ object AgoraConfig {
   lazy val mongoDbDatabase = config.as[Option[String]]("mongodb.db").getOrElse("agora")
 
   // SQL
-  lazy val sqlDatabase = Database.forConfig("sqlDatabase")
+  lazy val sqlDatabase = DatabaseConfig.forConfig[JdbcProfile]("sqlDatabase")
 
   // Google Credentials
   lazy val gcsProjectId = config.as[String]("gcs.project.id")

src/main/scala/org/broadinstitute/dsde/agora/server/ServerInitializer.scala

@@ -29,7 +29,7 @@ class ServerInitializer extends LazyLogging {
       EmbeddedMongo.stopMongo()
 
     println("Closing connection to sql db.")
-    AgoraConfig.sqlDatabase.close()
+    AgoraConfig.sqlDatabase.db.close()
 
     stopAndCatchExceptions(stopWebServiceActors())
   }

src/main/scala/org/broadinstitute/dsde/agora/server/dataaccess/permissions/PermissionsClient.scala

@@ -8,13 +8,12 @@ import org.broadinstitute.dsde.agora.server.model.AgoraEntity
 import scala.concurrent.{Await, Future}
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration._
-import slick.driver.MySQLDriver.api._
-
 import scala.util.Try
 
 trait PermissionsClient {
+  import AgoraConfig.sqlDatabase.profile.api._
+  val db = AgoraConfig.sqlDatabase.db
 
-  val db = AgoraConfig.sqlDatabase
   val timeout = 10.seconds
 
   def alias(entity: AgoraEntity): String

src/test/resources/reference.conf

@@ -34,8 +34,11 @@ openam {
 
 // Default uses a local h2 database
 sqlDatabase = {
-  url = "jdbc:h2:mem:test1"
-  driver = org.h2.Driver
-  connectionPool = disabled
-  keepAliveConnection = true
+  profile = "slick.jdbc.H2Profile$"
+  db {
+    connectionPool = disabled
+    driver = "org.h2.Driver"
+    url = "jdbc:h2:mem:test1"
+    keepAliveConnection = true
+  }
 }

src/test/scala/org/broadinstitute/dsde/agora/server/AgoraTestFixture.scala

@@ -20,7 +20,7 @@ trait AgoraTestFixture {
     EmbeddedMongo.startMongo()
 
     println("Connecting to test sql database.")
-    db = AgoraConfig.sqlDatabase
+    db = AgoraConfig.sqlDatabase.db
     clearDatabases()
 
     val setupFuture = createTableIfNotExists(entities, permissions, users)
@@ -73,7 +73,7 @@ trait AgoraTestFixture {
       tables map { table =>
         db.run(MTable.getTables(table.baseTableRow.tableName)).flatMap { result =>
           if (result.nonEmpty) {
-            db.run(table.delete)
+            db.run(sqlu"delete from #${table.baseTableRow.tableName}")
           } else {
             Future.successful(())
           }
@@ -84,7 +84,7 @@ trait AgoraTestFixture {
 
   def ensureSqlDatabaseIsRunning() = {
     println("Connecting to test sql database.")
-    db = AgoraConfig.sqlDatabase
+    db = AgoraConfig.sqlDatabase.db
 
     println("Populating sql database.")
     Await.result(createTableIfNotExists(entities, users, permissions), timeout)