Stop using deprecated classes and methods.

lastland · Jul 30, 2016 · e4b9ea8 · e4b9ea8
1 parent ae91bc9
commit e4b9ea8
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 39 deletions.
diff --git a/example/app/src/main/resources/application.conf b/example/app/src/main/resources/application.conf
@@ -1,9 +1,9 @@
 slick {
-  driver = "slick.driver.H2Driver$"
+  driver = "slick.jdbc.H2Profile$"
   version_control_dir = "./.db"
   db {
     url = "jdbc:h2:./test.tb"
     driver = "org.h2.Driver"
     connectionTimeout = 5000
   }
-}
+}
diff --git a/example/app/src/main/scala/Database.scala b/example/app/src/main/scala/Database.scala
@@ -1,5 +1,5 @@
-import slick.backend.DatabaseConfig
-import slick.driver.JdbcProfile
+import slick.basic.DatabaseConfig
+import slick.jdbc.JdbcProfile
 
 object MyDatabase {
   lazy val config = DatabaseConfig.forConfig[JdbcProfile]("slick")

diff --git a/example/build.sbt b/example/build.sbt
@@ -30,7 +30,7 @@ lazy val dbDependencies = List(
 )
 
 lazy val forkliftDependencies = List(
-  "com.liyaos" %% "scala-forklift-slick" % "0.2.2"
+  "com.liyaos" %% "scala-forklift-slick" % "0.2.3-SNAPSHOT"
 )
 
 lazy val appDependencies = dbDependencies ++ loggingDependencies
@@ -66,7 +66,7 @@ lazy val migrations = Project("migrations",
 lazy val tools = Project("git-tools",
   file("tools/git")).settings(commonSettings:_*).settings {
   libraryDependencies ++= forkliftDependencies ++ List(
-    "com.liyaos" %% "scala-forklift-git-tools" % "0.2.2",
+    "com.liyaos" %% "scala-forklift-git-tools" % "0.2.3-SNAPSHOT",
     "com.typesafe" % "config" % "1.3.0",
     "org.eclipse.jgit" % "org.eclipse.jgit" % "4.0.1.201506240215-r"
   )

diff --git a/example/migrations/src/main/scala/migrations/Summary.scala b/example/migrations/src/main/scala/migrations/Summary.scala
@@ -1,2 +1,3 @@
 object MigrationSummary {
+
 }
diff --git a/example/migrations/src_migrations/main/scala/1.scala b/example/migrations/src_migrations/main/scala/1.scala
@@ -1,4 +1,4 @@
-import slick.driver.H2Driver.api._
+import slick.jdbc.H2Profile.api._
 import com.liyaos.forklift.slick.SqlMigration
 
 object M1 {

diff --git a/example/migrations/src_migrations/main/scala/2.scala b/example/migrations/src_migrations/main/scala/2.scala
@@ -1,4 +1,4 @@
-import slick.driver.H2Driver.api._
+import slick.jdbc.H2Profile.api._
 import com.liyaos.forklift.slick.DBIOMigration
 import datamodel.v1.schema.tables.Users
 import datamodel.v1.schema.tables.UsersRow

diff --git a/example/migrations/src_migrations/main/scala/3.scala b/example/migrations/src_migrations/main/scala/3.scala
@@ -1,4 +1,4 @@
-import slick.driver.H2Driver.api._
+import slick.jdbc.H2Profile.api._
 import com.liyaos.forklift.slick.SqlMigration
 
 object M3 {

diff --git a/migrations/slick/src/main/scala/Codegen.scala b/migrations/slick/src/main/scala/Codegen.scala
@@ -7,7 +7,7 @@ import scala.concurrent.Future
 import scala.concurrent.Await
 import scala.concurrent.ExecutionContext.Implicits.global
 import slick.model.Model
-import slick.driver.JdbcProfile
+import slick.jdbc.JdbcProfile
 import slick.codegen.SourceCodeGenerator
 
 trait SlickCodegen {
@@ -23,8 +23,8 @@ trait SlickCodegen {
 
   def tableNames: Seq[String] = List()
 
-  def getTables(driver: JdbcProfile) = driver.createModel(Some(
-    driver.defaultTables.map { s =>
+  def getTables(profile: JdbcProfile) = profile.createModel(Some(
+    profile.defaultTables.map { s =>
       s.filter { t =>
         tableNames.contains(t.name.name)
       }
@@ -48,21 +48,21 @@ object Version{
   val waitDuration = Duration.Inf
 
   def genCode(mm: SlickMigrationManager) {
-    import mm.dbConfig.driver.api._
+    import mm.dbConfig.profile.api._
     if (mm.notYetAppliedMigrations.size > 0) {
       println("Your database is not up to date, code generation denied for compatibility reasons. Please update first.")
       return
     }
-    val driver = mm.dbConfig.driver
-    val action = getTables(driver).flatMap { case m =>
+    val profile = mm.dbConfig.profile
+    val action = getTables(profile).flatMap { case m =>
         DBIO.from {
           Future {
             val latest = mm.latest
             latest match {
               case Some(latestVersion) =>
                 List( "v" + latestVersion, "latest" ).foreach { version =>
                   val generator = getGenerator(m, latestVersion)
-                  generator.writeToFile(s"slick.driver.${driver}",
+                  generator.writeToFile(s"${profile.toString.dropRight(1)}",
                     generatedDir, pkgName(version), container, fileName)
                 }
               case None =>

diff --git a/migrations/slick/src/main/scala/Commands.scala b/migrations/slick/src/main/scala/Commands.scala
@@ -186,9 +186,9 @@ trait SlickMigrationCommands extends MigrationCommands[Int, slick.dbio.DBIO[Unit
 
   def addMigrationOp(tpe: MigrationType, version: Int) {
     val migrationObject = config.getString("migrations.migration_object")
-    val driverName = dbConfig.driverName
+    val profileName = dbConfig.profileName
     val content = tpe match {
-      case SQL => s"""import ${driverName}.api._
+      case SQL => s"""import ${profileName}.api._
 import com.liyaos.forklift.slick.SqlMigration
 
 object M${version} {
@@ -203,7 +203,7 @@ object M${version} {
             s"""import datamodel.v${version - 1}.schema.tables.Users
 import datamodel.v${version - 1}.schema.tables.UsersRow"""
           else ""
-        s"""import ${driverName}.api._
+        s"""import ${profileName}.api._
 import com.liyaos.forklift.slick.DBIOMigration
 ${imports}
 

diff --git a/migrations/slick/src/main/scala/SlickMigrationManager.scala b/migrations/slick/src/main/scala/SlickMigrationManager.scala
@@ -5,8 +5,8 @@ import scala.concurrent.duration._
 import scala.concurrent.Future
 import scala.concurrent.Await
 import scala.concurrent.ExecutionContext.Implicits.global
-import slick.backend.DatabaseConfig
-import slick.driver.JdbcProfile
+import slick.basic.DatabaseConfig
+import slick.jdbc.JdbcProfile
 import slick.jdbc.meta.MTable
 import com.liyaos.forklift.core.Migration
 import com.liyaos.forklift.core.MigrationManager
@@ -15,7 +15,7 @@ trait SlickMigrationManager
     extends MigrationManager[Int, slick.dbio.DBIO[Unit]] {
   lazy val dbConfig = SlickMigrationsConfig.dbConfig
 
-  import dbConfig.driver.api._
+  import dbConfig.profile.api._
 
   class MigrationsTable(tag: Tag) extends Table[Int](tag, "__migrations__") {
     def id = column[Int]("id", O.PrimaryKey)

diff --git a/migrations/slick/src/main/scala/SlickMigrationsConfig.scala b/migrations/slick/src/main/scala/SlickMigrationsConfig.scala
@@ -1,7 +1,7 @@
 package com.liyaos.forklift.slick
 
-import slick.backend.DatabaseConfig
-import slick.driver.JdbcProfile
+import slick.basic.DatabaseConfig
+import slick.jdbc.JdbcProfile
 
 trait SlickMigrationsConfig {
   val dbConfig = DatabaseConfig.forConfig[JdbcProfile]("migrations.slick")

diff --git a/migrations/slick/src/test/scala/UnitTests/ConfigFile.scala b/migrations/slick/src/test/scala/UnitTests/ConfigFile.scala
@@ -3,8 +3,8 @@ package com.liyaos.forklift.slick.tests.unittests
 import java.util.HashMap
 import com.typesafe.config._
 import ammonite.ops._
-import slick.backend.DatabaseConfig
-import slick.driver.JdbcProfile
+import slick.basic.DatabaseConfig
+import slick.jdbc.JdbcProfile
 
 trait ConfigFile {
   this: Tables =>
@@ -60,28 +60,28 @@ trait ConfigFile {
 }
 
 trait H2ConfigFile extends ConfigFile with Tables {
-  val driver = "slick.driver.H2Driver$"
+  val driver = "slick.jdbc.H2Profile$"
   val dbDriver = "org.h2.Driver"
   val dbUrl = s"jdbc:h2:$path/test"
 
-  val profile = slick.driver.H2Driver
+  val profile = slick.jdbc.H2Profile
 }
 
 trait SQLiteConfigFile extends ConfigFile with Tables {
-  val driver = "slick.driver.SQLiteDriver$"
+  val driver = "slick.jdbc.SQLiteProfile$"
   val dbDriver = "org.sqlite.JDBC"
   val dbUrl = s"jdbc:sqlite:$path/test.sqlite.db"
 
-  val profile = slick.driver.SQLiteDriver
+  val profile = slick.jdbc.SQLiteProfile
 }
 
 trait MySQLConfigFile extends ConfigFile with Tables {
   val user = System.getProperty("user.name")
-  val driver = "slick.driver.MySQLDriver$"
+  val driver = "slick.jdbc.MySQLProfile$"
   val dbDriver = "com.mysql.jdbc.Driver"
   val dbUrl = s"jdbc:mysql://localhost/circle_test"
 
-  val profile = slick.driver.MySQLDriver
+  val profile = slick.jdbc.MySQLProfile
 
   protected override def dbMap = {
     val dbMap = super.dbMap
@@ -92,11 +92,11 @@ trait MySQLConfigFile extends ConfigFile with Tables {
 
 trait PostgresConfigFile extends ConfigFile with Tables {
   val user = System.getProperty("user.name")
-  val driver = "slick.driver.PostgresDriver$"
+  val driver = "slick.jdbc.PostgresProfile$"
   val dbDriver = "org.postgresql.Driver"
   val dbUrl = s"jdbc:postgresql://localhost/circle_test"
 
-  val profile = slick.driver.PostgresDriver
+  val profile = slick.jdbc.PostgresProfile
 
   protected override def dbMap = {
     val dbMap = super.dbMap
@@ -106,18 +106,18 @@ trait PostgresConfigFile extends ConfigFile with Tables {
 }
 
 trait HsqldbConfigFile extends ConfigFile with Tables {
-  val driver = "slick.driver.HsqldbDriver$"
+  val driver = "slick.jdbc.HsqldbProfile$"
   val dbDriver = "org.hsqldb.jdbc.JDBCDriver"
   val dbUrl = s"jdbc:hsqldb:mem:test"
 
-  val profile = slick.driver.HsqldbDriver
+  val profile = slick.jdbc.HsqldbProfile
 }
 
 trait DerbyConfigFile extends ConfigFile with Tables {
-  val driver = "slick.driver.DerbyDriver$"
+  val driver = "slick.jdbc.DerbyProfile$"
   val dbDriver = "org.apache.derby.jdbc.EmbeddedDriver"
   val dbUrl = s"jdbc:derby:$path/test.derby.db;create=true"
   override val timeout = new Integer(10000)
 
-  val profile = slick.driver.DerbyDriver
+  val profile = slick.jdbc.DerbyProfile
 }
diff --git a/migrations/slick/src/test/scala/UnitTests/Tables.scala b/migrations/slick/src/test/scala/UnitTests/Tables.scala
@@ -1,6 +1,6 @@
 package com.liyaos.forklift.slick.tests.unittests
 
-import slick.driver.JdbcProfile
+import slick.jdbc.JdbcProfile
 
 case class UsersRow(id: Int, first: String, last: String)