From 8277b4881039abbb2ba69ac93092410386167499 Mon Sep 17 00:00:00 2001 From: Stewart Stewart Date: Sun, 24 Sep 2017 01:00:07 -0700 Subject: update emitted code for Slick 3.2.1 --- src/main/scala/Generators.scala | 2 +- src/main/scala/Main.scala | 4 ++-- src/main/scala/OutputHelpers.scala | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/scala/Generators.scala b/src/main/scala/Generators.scala index ae410fb..5bc192f 100644 --- a/src/main/scala/Generators.scala +++ b/src/main/scala/Generators.scala @@ -53,7 +53,7 @@ class TableSourceCodeGenerator(schemaOnlyModel: m.Model, val defaultIdImplementation = """|final case class Id[T](v: Int) |trait DefaultIdTypeMapper { - | val profile: slick.driver.JdbcProfile + | val profile: slick.jdbc.JdbcProfile | import profile.api._ | implicit def idTypeMapper[A]: BaseColumnType[Id[A]] = MappedColumnType.base[Id[A], Int](_.v, Id(_)) |} diff --git a/src/main/scala/Main.scala b/src/main/scala/Main.scala index 2a4624f..eee6c6f 100644 --- a/src/main/scala/Main.scala +++ b/src/main/scala/Main.scala @@ -56,8 +56,8 @@ object Generator { parsedSchemasOpt.getOrElse(Map.empty).foreach { case (schemaName, tables) => val profile = - s"""slick.backend.DatabaseConfig.forConfig[slick.driver.JdbcProfile]("${uri - .getFragment()}").driver""" + s"""slick.basic.DatabaseConfig.forConfig[slick.jdbc.JdbcProfile]("${uri + .getFragment()}").profile""" val schemaOnlyModel = Await.result(dc.db.run(ModelTransformation .createModel(dc.profile, Some(Map(schemaName -> tables)))), diff --git a/src/main/scala/OutputHelpers.scala b/src/main/scala/OutputHelpers.scala index 17c2019..975bed9 100644 --- a/src/main/scala/OutputHelpers.scala +++ b/src/main/scala/OutputHelpers.scala @@ -18,8 +18,7 @@ trait TableOutputHelpers extends TableFileGenerator with OutputHelpers { self: S |$imports | |/** Stand-alone Slick data model for immediate use */ - |// TODO: change this to `object tables` - |object `package` extends { + |object tables extends { | val profile = $profile |} with Tables | -- cgit v1.2.3