diff options
| -rw-r--r-- | src/main/scala/xyz/driver/core/database/database.scala | 6 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/core/database/package.scala | 4 |
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 = { |