From 760b0de04944e434394f7463def0353c35827484 Mon Sep 17 00:00:00 2001 From: Stewart Stewart Date: Fri, 9 Dec 2016 12:24:26 -0800 Subject: scalafmt --- src/main/scala/NamespacedCodegen.scala | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/main/scala') 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} -- cgit v1.2.3