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/package.scala | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/main/scala/xyz/driver/core/database/package.scala')

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


From 7b41250c9258f39551ea663fdf56492941597c43 Mon Sep 17 00:00:00 2001
From: Stewart Stewart <stewart@driver.xyz>
Date: Thu, 25 May 2017 16:11:31 -0700
Subject: disassociate createAndDropSchema from scalatest

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

(limited to 'src/main/scala/xyz/driver/core/database/package.scala')

diff --git a/src/main/scala/xyz/driver/core/database/database.scala b/src/main/scala/xyz/driver/core/database/database.scala
index 6fbea03..8426309 100644
--- a/src/main/scala/xyz/driver/core/database/database.scala
+++ b/src/main/scala/xyz/driver/core/database/database.scala
@@ -129,13 +129,11 @@ package database {
     import scala.concurrent.Await
     import scala.concurrent.duration.Duration
 
-    // Note: Does not call `super.beforeEach()` (for org.scalatest.BeforeAndAfterEach)
-    def beforeEach(): Unit = {
+    def createSchema(): Unit = {
       Await.result(slickDal.execute(tables.createNamespaceSchema >> tables.schema.create), Duration.Inf)
     }
 
-    // Note: Does not call `super.afterEach()` (for org.scalatest.BeforeAndAfterEach)
-    def afterEach(): Unit = {
+    def dropSchema(): Unit = {
       Await.result(slickDal.execute(tables.schema.drop >> tables.dropNamespaceSchema), Duration.Inf)
     }
   }
diff --git a/src/main/scala/xyz/driver/core/database/package.scala b/src/main/scala/xyz/driver/core/database/package.scala
index a28d033..b39169d 100644
--- a/src/main/scala/xyz/driver/core/database/package.scala
+++ b/src/main/scala/xyz/driver/core/database/package.scala
@@ -10,8 +10,8 @@ import slick.driver.JdbcProfile
 package object database {
 
   type Schema = {
-    def create: DBIOAction[Unit, NoStream, slick.dbio.Effect.Schema]
-    def drop: DBIOAction[Unit, NoStream, slick.dbio.Effect.Schema]
+    def create: DBIOAction[Unit, NoStream, Effect.Schema]
+    def drop: DBIOAction[Unit, NoStream, Effect.Schema]
   }
 
   type GeneratedTables = {
-- 
cgit v1.2.3