From af603a5706bf1ac6b7276f48f9235cdcacbf609f Mon Sep 17 00:00:00 2001 From: Stewart Stewart Date: Tue, 21 Feb 2017 21:25:19 -0500 Subject: override parentType and use writeToFile --- src/main/scala/NamespacedCodegen.scala | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/main') diff --git a/src/main/scala/NamespacedCodegen.scala b/src/main/scala/NamespacedCodegen.scala index 36dd03a..52761b9 100644 --- a/src/main/scala/NamespacedCodegen.scala +++ b/src/main/scala/NamespacedCodegen.scala @@ -53,19 +53,15 @@ object Generator { dbModel, schemaOnlyModel, manualForeignKeys, + parentType, idType, schemaImports, typeReplacements) - generator.writeStringToFile( - content = generator.packageCode(profile = profile, - pkg = pkg, - container = schemaName, - parentType = parentType), - folder = outputPath, - pkg = pkg, - fileName = s"${schemaName}.scala") - // TODO: Use generator.writeToFile, after figuring out `parentType` - // parentType in scope used here is defaulted to None and needs to be overriden + generator.writeToFile(profile = profile, + folder = outputPath, + pkg = pkg, + container = schemaName, + fileName = s"${schemaName}.scala") } } finally { dc.db.close() @@ -84,6 +80,7 @@ class Generator(pkg: String, fullDatabaseModel: Model, schemaOnlyModel: Model, manualForeignKeys: Map[(String, String), (String, String)], + override val parentType: Option[String], idType: Option[String], schemaImports: List[String], typeReplacements: Map[String, String]) -- cgit v1.2.3