From a76870feabe6b132e67c576d08dc92a15c241b8e Mon Sep 17 00:00:00 2001 From: Stewart Stewart Date: Fri, 24 Feb 2017 09:14:22 -0500 Subject: use concrete tableGenerator --- src/main/scala/NamespacedCodegen.scala | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main/scala/NamespacedCodegen.scala b/src/main/scala/NamespacedCodegen.scala index 05b1c35..ca32641 100644 --- a/src/main/scala/NamespacedCodegen.scala +++ b/src/main/scala/NamespacedCodegen.scala @@ -43,6 +43,7 @@ object Generator { DatabaseConfig.forURI[JdbcProfile](uri) val parsedSchemasOpt: Option[Map[String, List[String]]] = schemaNames.map(SchemaParser.parse) + val imports = schemaImports.map("import " + _).mkString("\n") try { val dbModel: Model = Await.result( @@ -64,14 +65,24 @@ object Generator { val rowGenerator = new RowSourceCodeGenerator( schemaOnlyModel, headerComment = header, - imports = schemaImports.map("import " + _).mkString("\n"), + imports = imports, schemaName = schemaName, dbModel, idType, manualForeignKeys ) - /* - val tableGenerator: TableFileGenerator = ??? + + val tableGenerator = new TableSourceCodeGenerator( + schemaOnlyModel = schemaOnlyModel, + headerComment = header, + imports = imports, + schemaName = schemaName, + fullDatabaseModel = dbModel, + pkg = pkg, + manualForeignKeys, + parentType = parentType, + idType, + typeReplacements) outputSchemaCode( schemaName = schemaName, @@ -80,7 +91,6 @@ object Generator { pkg = pkg, tableGen = tableGenerator, rowGen = rowGenerator) - */ } } finally { dc.db.close() -- cgit v1.2.3