diff options
| author | Stewart Stewart <stewinsalot@gmail.com> | 2017-09-22 16:51:15 -0700 |
|---|---|---|
| committer | Stewart Stewart <stewinsalot@gmail.com> | 2017-09-22 16:51:15 -0700 |
| commit | 94e2a082467c5fbf70490c33ebe25ca6d2318b8e (patch) | |
| tree | 74efa465b1fd2ceeb5a4c96d1af9217153723756 | |
| parent | 3904da2e8e67eb03b7283530b8aa81574553bca5 (diff) | |
| download | slick-codegen-plugin-94e2a082467c5fbf70490c33ebe25ca6d2318b8e.tar.gz slick-codegen-plugin-94e2a082467c5fbf70490c33ebe25ca6d2318b8e.tar.bz2 slick-codegen-plugin-94e2a082467c5fbf70490c33ebe25ca6d2318b8e.zip | |
address warnings
| -rw-r--r-- | src/main/scala/CodegenPlugin.scala | 2 | ||||
| -rw-r--r-- | src/main/scala/Generators.scala | 1 | ||||
| -rw-r--r-- | src/main/scala/Main.scala | 10 | ||||
| -rw-r--r-- | src/main/scala/SchemaParser.scala | 2 |
4 files changed, 5 insertions, 10 deletions
diff --git a/src/main/scala/CodegenPlugin.scala b/src/main/scala/CodegenPlugin.scala index 22671b1..6217695 100644 --- a/src/main/scala/CodegenPlugin.scala +++ b/src/main/scala/CodegenPlugin.scala @@ -1,6 +1,4 @@ import sbt._ -import sbt.Keys._ -import complete.DefaultParsers._ object CodegenPlugin extends AutoPlugin { override def requires = sbt.plugins.JvmPlugin diff --git a/src/main/scala/Generators.scala b/src/main/scala/Generators.scala index 92bb9ee..b7b499e 100644 --- a/src/main/scala/Generators.scala +++ b/src/main/scala/Generators.scala @@ -1,4 +1,3 @@ -import slick.codegen.SourceCodeGenerator import slick.{model => m} class RowSourceCodeGenerator( diff --git a/src/main/scala/Main.scala b/src/main/scala/Main.scala index e71a9e8..7f0374c 100644 --- a/src/main/scala/Main.scala +++ b/src/main/scala/Main.scala @@ -1,12 +1,10 @@ import java.net.URI -import java.nio.file.Paths import scala.concurrent.Await import scala.concurrent.duration.Duration -import scala.concurrent.ExecutionContext.Implicits.global -import slick.backend.DatabaseConfig +import slick.basic.DatabaseConfig import slick.codegen.SourceCodeGenerator -import slick.driver.JdbcProfile +import slick.jdbc.JdbcProfile trait TableFileGenerator { self: SourceCodeGenerator => def writeTablesToFile(profile: String, @@ -59,7 +57,7 @@ object Generator { try { val dbModel: slick.model.Model = Await.result( dc.db.run( - ModelTransformation.createModel(dc.driver, parsedSchemasOpt)), + ModelTransformation.createModel(dc.profile, parsedSchemasOpt)), Duration.Inf) parsedSchemasOpt.getOrElse(Map.empty).foreach { @@ -70,7 +68,7 @@ object Generator { val schemaOnlyModel = Await.result( dc.db.run(ModelTransformation - .createModel(dc.driver, Some(Map(schemaName -> tables)))), + .createModel(dc.profile, Some(Map(schemaName -> tables)))), Duration.Inf) val rowGenerator = new RowSourceCodeGenerator( diff --git a/src/main/scala/SchemaParser.scala b/src/main/scala/SchemaParser.scala index 395850e..85fffaf 100644 --- a/src/main/scala/SchemaParser.scala +++ b/src/main/scala/SchemaParser.scala @@ -1,7 +1,7 @@ import scala.concurrent.ExecutionContext.Implicits.global import slick.dbio.DBIO -import slick.driver.JdbcProfile +import slick.jdbc.JdbcProfile import slick.jdbc.meta.MTable import slick.relational.RelationalProfile.ColumnOption.Length import slick.sql.SqlProfile.ColumnOption.SqlType |