From f56b126119453e52d0434b186b6287bbe179501b Mon Sep 17 00:00:00 2001
From: Stewart Stewart <stewinsalot@gmail.com>
Date: Wed, 15 Feb 2017 14:38:35 -0800
Subject: don't override generated code

---
 src/main/scala/NamespacedCodegen.scala | 58 +---------------------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

(limited to 'src/main/scala')

diff --git a/src/main/scala/NamespacedCodegen.scala b/src/main/scala/NamespacedCodegen.scala
index f7c9d7c..0bd4717 100644
--- a/src/main/scala/NamespacedCodegen.scala
+++ b/src/main/scala/NamespacedCodegen.scala
@@ -94,26 +94,8 @@ class PackageNameGenerator(pkg: String, dbModel: Model)
 
 class ImportGenerator(dbModel: Model, schemaImports: List[String])
     extends SourceCodeGenerator(dbModel) {
-
-  val baseImports: String = schemaImports
-      .map("import " + _)
-      .mkString("\n") + "\n"
-
-  val hlistImports: String =
-    """|import slick.collection.heterogeneous._
-       |import slick.collection.heterogeneous.syntax._
-       |""".stripMargin
-
-  val plainSqlMapperImports: String =
-    if (tables.exists(_.PlainSqlMapper.enabled))
-      """|import slick.jdbc.{GetResult => GR}
-         |//NOTE: GetResult mappers for plain SQL are only generated for tables where Slick knows how to map the types of all columns.\n
-         |""".stripMargin
-    else ""
-
   override def code: String =
-    baseImports + hlistImports + plainSqlMapperImports
-  // remove the latter two when go back to inherriting `def code`
+    schemaImports.map("import " + _).mkString("\n") + "\n"
 }
 
 class Generator(pkg: String,
@@ -141,44 +123,6 @@ class Generator(pkg: String,
        |}
        |""".stripMargin
 
-  // override def tables = {
-  //   dbModel.tables.map(Table).sortBy(_.TableClass.rawName.toLowerCase)
-  //     .filter(_.model.name.schema.getOrElse("`public`") == schemaName)
-  // }
-  // Can't override with final
-  // Can't reference super with lazy
-
-  override def code: String = {
-    val tableCode = tables.map(_.code.mkString("\n")).mkString("\n\n")
-
-    val ddlCode =
-      (if (ddlEnabled) {
-         "\n/** DDL for all tables. Call .create to execute. */" +
-           (
-             if (tables.length > 5)
-               "\nlazy val schema: profile.SchemaDescription = Array(" + tables
-                 .map(_.TableValue.name + ".schema")
-                 .mkString(", ") + ").reduceLeft(_ ++ _)"
-             else if (tables.nonEmpty)
-               "\nlazy val schema: profile.SchemaDescription = " + tables
-                 .map(_.TableValue.name + ".schema")
-                 .mkString(" ++ ")
-             else
-               "\nlazy val schema: profile.SchemaDescription = profile.DDL(Nil, Nil)"
-           ) +
-           "\n\n"
-       } else "")
-
-    if (idType.isEmpty) { // TODO move out
-      writeStringToFile(packageName + defaultIdImplementation,
-                        "", //outputPath,
-                        pkg,
-                        "Id.scala")
-    }
-
-    tableCode + "\n  " + ddlCode
-  }
-
   override def packageCode(profile: String,
                            pkg: String,
                            container: String,
-- 
cgit v1.2.3