From 8fb0784cf220f72bc5aca87566e620b2d935b33c Mon Sep 17 00:00:00 2001
From: Stewart Stewart <stewinsalot@gmail.com>
Date: Fri, 24 Feb 2017 03:15:30 -0500
Subject: checkpoint

---
 src/main/scala/NamespacedCodegen.scala | 23 ++++++++++-------------
 src/main/scala/OutputHelpers.scala     |  5 ++---
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/main/scala/NamespacedCodegen.scala b/src/main/scala/NamespacedCodegen.scala
index bdb9fc6..f08bd6c 100644
--- a/src/main/scala/NamespacedCodegen.scala
+++ b/src/main/scala/NamespacedCodegen.scala
@@ -46,6 +46,9 @@ object Generator {
                                        Some(Map(schemaName -> tables)))),
             Duration.Inf)
 
+          val camelSchemaName =
+            schemaName.split('_').map(_.capitalize).mkString("")
+
           val tableGenerator = new TableGenerator(pkg,
                                                   dbModel,
                                                   schemaOnlyModel,
@@ -54,13 +57,13 @@ object Generator {
                                                   idType,
                                                   header,
                                                   schemaImports,
-                                                  typeReplacements,
-                                                  schemaName)
+                                                  typeReplacements)
           tableGenerator.writeToFile(profile = profile,
                                      folder = outputPath,
-                                     pkg = pkg,
+                                     pkg = s"$pkg.$schemaName",
                                      container = schemaName,
-                                     fileName = s"${schemaName}.scala")
+                                     fileName =
+                                       s"${camelSchemaName}Tables.scala")
 
           val rowGenerator = new RowGenerator(pkg,
                                               dbModel,
@@ -73,9 +76,8 @@ object Generator {
                                               typeReplacements)
           rowGenerator.writeToFile(schemaName = schemaName,
                                    folder = outputPath,
-                                   pkg = pkg,
-                                   fileName =
-                                     s"${schemaName.capitalize}Rows.scala")
+                                   pkg = s"$pkg.$schemaName",
+                                   fileName = s"${camelSchemaName}Rows.scala")
       }
     } finally {
       dc.db.close()
@@ -339,8 +341,7 @@ class TableGenerator(
     idType: Option[String],
     override val headerComment: String,
     schemaImports: List[String],
-    typeReplacements: Map[String, String],
-    schemaName: String)
+    typeReplacements: Map[String, String])
     extends Generator(pkg,
                       fullDatabaseModel,
                       schemaOnlyModel,
@@ -355,9 +356,5 @@ class TableGenerator(
     override def EntityType = new EntityType {
       override def enabled = false
     }
-    override def TableClass = new TableClass {
-      override def elementType = s"$schemaName.${super.elementType}"
-      override def optionEnabled = false
-    }
   }
 }
diff --git a/src/main/scala/OutputHelpers.scala b/src/main/scala/OutputHelpers.scala
index 82eabd1..3a184a4 100644
--- a/src/main/scala/OutputHelpers.scala
+++ b/src/main/scala/OutputHelpers.scala
@@ -8,7 +8,6 @@ trait OutputHelpers extends slick.codegen.OutputHelpers {
                            pkg: String,
                            container: String,
                            parentType: Option[String]): String = {
-    val traitName = container.capitalize + "SchemaDef"
     s"""|${headerComment.trim().lines.map("// " + _).mkString("\n")}
         |package $pkg
         |
@@ -17,10 +16,10 @@ trait OutputHelpers extends slick.codegen.OutputHelpers {
         |/** Stand-alone Slick data model for immediate use */
         |package object $container extends {
         |  val profile = $profile
-        |} with $traitName
+        |} with Tables
         |
         |/** Slick data model trait for extension, choice of backend or usage in the cake pattern. (Make sure to initialize this late.) */
-        |trait $traitName${parentType.fold("")(" extends " + _)} {
+        |trait Tables${parentType.fold("")(" extends " + _)} {
         |  import profile.api._
         |  ${indent(code)}
         |}""".stripMargin.trim()
-- 
cgit v1.2.3