From 576cce1fd5d58030a2c66bd3e93956c3e7cb770e Mon Sep 17 00:00:00 2001
From: Stewart Stewart <stewart@driver.xyz>
Date: Thu, 25 May 2017 15:46:51 -0700
Subject: make GeneratedTables a structural type

---
 src/main/scala/xyz/driver/core/database/database.scala | 10 ----------
 src/main/scala/xyz/driver/core/database/package.scala  | 12 +++++++++++-
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/main/scala/xyz/driver')

diff --git a/src/main/scala/xyz/driver/core/database/database.scala b/src/main/scala/xyz/driver/core/database/database.scala
index 8d61899..6fbea03 100644
--- a/src/main/scala/xyz/driver/core/database/database.scala
+++ b/src/main/scala/xyz/driver/core/database/database.scala
@@ -121,16 +121,6 @@ package database {
     def naturalKeyMapper[T] = MappedColumnType.base[Id[T], String](_.value, Id[T](_))
   }
 
-  trait GeneratedTables extends ColumnTypes {
-    import slick.dbio._
-
-    val profile: JdbcProfile
-    def schema: profile.SchemaDescription
-
-    def createNamespaceSchema: StreamingDBIO[Vector[Unit], Unit]
-    def dropNamespaceSchema: StreamingDBIO[Vector[Unit], Unit]
-  }
-
   trait CreateAndDropSchema {
     val slickDal: xyz.driver.core.database.SlickDal
     val tables: GeneratedTables
diff --git a/src/main/scala/xyz/driver/core/database/package.scala b/src/main/scala/xyz/driver/core/database/package.scala
index 791a688..a28d033 100644
--- a/src/main/scala/xyz/driver/core/database/package.scala
+++ b/src/main/scala/xyz/driver/core/database/package.scala
@@ -4,7 +4,8 @@ import java.sql.{Date => SqlDate}
 import java.util.Calendar
 
 import date.{Date, Month}
-import slick.dbio.{DBIOAction, NoStream}
+import slick.dbio._
+import slick.driver.JdbcProfile
 
 package object database {
 
@@ -13,6 +14,15 @@ package object database {
     def drop: DBIOAction[Unit, NoStream, slick.dbio.Effect.Schema]
   }
 
+  type GeneratedTables = {
+    // structure of Slick data model traits generated by sbt-slick-codegen
+    val profile: JdbcProfile
+    def schema: profile.SchemaDescription
+
+    def createNamespaceSchema: StreamingDBIO[Vector[Unit], Unit]
+    def dropNamespaceSchema: StreamingDBIO[Vector[Unit], Unit]
+  }
+
   private[database] def sqlDateToDate(sqlDate: SqlDate): Date = {
     // NOTE: SQL date does not have a time component, so this date
     // should only be interpreted in the running JVMs timezone.
-- 
cgit v1.2.3