aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStewart Stewart <stewart@driver.xyz>2017-05-25 16:11:31 -0700
committerStewart Stewart <stewart@driver.xyz>2017-05-25 16:21:31 -0700
commit7b41250c9258f39551ea663fdf56492941597c43 (patch)
tree40f55579027336f8c8528c41118faf855436aef4
parent576cce1fd5d58030a2c66bd3e93956c3e7cb770e (diff)
downloaddriver-core-7b41250c9258f39551ea663fdf56492941597c43.tar.gz
driver-core-7b41250c9258f39551ea663fdf56492941597c43.tar.bz2
driver-core-7b41250c9258f39551ea663fdf56492941597c43.zip
disassociate createAndDropSchema from scalatest
-rw-r--r--src/main/scala/xyz/driver/core/database/database.scala6
-rw-r--r--src/main/scala/xyz/driver/core/database/package.scala4
2 files changed, 4 insertions, 6 deletions
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 = {