diff options
| author | Stewart Stewart <stewinsalot@gmail.com> | 2017-05-30 17:46:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-30 17:46:09 -0700 |
| commit | f58872065d859cdc3ce8489acdf0b443041e37a3 (patch) | |
| tree | af6a6f9ff1d33fccb812ab4655678a9417388551 /src/main/scala/Main.scala | |
| parent | 25c43332dd037da26341b5ccd27aca0b6a58caed (diff) | |
| parent | 66f6f78b9230b3a59ab2d77c31b03f209c0937f8 (diff) | |
| download | slick-codegen-plugin-f58872065d859cdc3ce8489acdf0b443041e37a3.tar.gz slick-codegen-plugin-f58872065d859cdc3ce8489acdf0b443041e37a3.tar.bz2 slick-codegen-plugin-f58872065d859cdc3ce8489acdf0b443041e37a3.zip | |
Merge branch 'master' into row-import-statements
Diffstat (limited to 'src/main/scala/Main.scala')
| -rw-r--r-- | src/main/scala/Main.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/scala/Main.scala b/src/main/scala/Main.scala index 866023d..e71a9e8 100644 --- a/src/main/scala/Main.scala +++ b/src/main/scala/Main.scala @@ -52,13 +52,14 @@ object Generator { val dc: DatabaseConfig[JdbcProfile] = DatabaseConfig.forURI[JdbcProfile](uri) val parsedSchemasOpt: Option[Map[String, List[String]]] = - schemaNames.map(SchemaParser.parse) + schemaNames.map(ModelTransformation.parseSchemaList) def importStatements(imports: List[String]) = imports.map("import " + _).mkString("\n") try { val dbModel: slick.model.Model = Await.result( - dc.db.run(SchemaParser.createModel(dc.driver, parsedSchemasOpt)), + dc.db.run( + ModelTransformation.createModel(dc.driver, parsedSchemasOpt)), Duration.Inf) parsedSchemasOpt.getOrElse(Map.empty).foreach { @@ -68,9 +69,8 @@ object Generator { .getFragment()}").driver""" val schemaOnlyModel = Await.result( - dc.db.run( - SchemaParser.createModel(dc.driver, - Some(Map(schemaName -> tables)))), + dc.db.run(ModelTransformation + .createModel(dc.driver, Some(Map(schemaName -> tables)))), Duration.Inf) val rowGenerator = new RowSourceCodeGenerator( |