diff options
author | Stewart Stewart <stewinsalot@gmail.com> | 2016-12-09 12:24:26 -0800 |
---|---|---|
committer | Stewart Stewart <stewinsalot@gmail.com> | 2016-12-09 12:24:26 -0800 |
commit | 760b0de04944e434394f7463def0353c35827484 (patch) | |
tree | 4ab374711aa9e335d11467ae52737a17703e2d63 /src | |
parent | 73d8c2cd2a27a2c883300654bd0ef62c7ce19c82 (diff) | |
download | slick-codegen-plugin-760b0de04944e434394f7463def0353c35827484.tar.gz slick-codegen-plugin-760b0de04944e434394f7463def0353c35827484.tar.bz2 slick-codegen-plugin-760b0de04944e434394f7463def0353c35827484.zip |
scalafmt
Diffstat (limited to 'src')
-rw-r--r-- | src/main/scala/NamespacedCodegen.scala | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/main/scala/NamespacedCodegen.scala b/src/main/scala/NamespacedCodegen.scala index a3df345..2570ba2 100644 --- a/src/main/scala/NamespacedCodegen.scala +++ b/src/main/scala/NamespacedCodegen.scala @@ -25,12 +25,13 @@ object Generator { manualForeignKeys: Map[(String, String), (String, String)], schemaBaseClass: String, idType: Option[String], - schemaImports: List[String], - typeReplacements: Map[String, String]) = { + schemaImports: List[String], + typeReplacements: Map[String, String]) = { val dc: DatabaseConfig[JdbcProfile] = DatabaseConfig.forURI[JdbcProfile](uri) val parsedSchemasOpt: Option[Map[String, List[String]]] = schemaNames.map(SchemaParser.parse) + val dbModel: Model = Await.result( dc.db.run(SchemaParser.createModel(dc.driver, parsedSchemasOpt)), Duration.Inf) @@ -42,8 +43,8 @@ object Generator { manualForeignKeys, schemaBaseClass, idType, - schemaImports, - typeReplacements) + schemaImports, + typeReplacements) generator.code // Yes... Files are written as a side effect parsedSchemasOpt .getOrElse(Map()) @@ -98,8 +99,8 @@ class Generator(uri: URI, manualForeignKeys: Map[(String, String), (String, String)], schemaBaseClass: String, idType: Option[String], - schemaImports: List[String], - typeReplacements: Map[String, String]) + schemaImports: List[String], + typeReplacements: Map[String, String]) extends SourceCodeGenerator(dbModel) with OutputHelpers { @@ -130,7 +131,8 @@ class Generator(uri: URI, .mkString("\n\n") val generatedSchema = s""" |object ${schemaName} extends { - | val profile = slick.backend.DatabaseConfig.forConfig[slick.driver.JdbcProfile]("${uri.getFragment()}").driver + | val profile = slick.backend.DatabaseConfig.forConfig[slick.driver.JdbcProfile]("${uri + .getFragment()}").driver |} with $schemaBaseClass { | import profile.api._ | ${tableCode} |