diff options
author | zachdriver <zach@driver.xyz> | 2017-08-23 10:53:44 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-23 10:53:44 -0700 |
commit | cb6f0774a86f88e0ebd9ed8d2a6d232469d0cf5a (patch) | |
tree | 96e7b6d1aef1f33d11012173a3bee5367fa998a4 /src/main/scala/xyz | |
parent | a8685a0df2705e320cf5f0ba780878bb972e59bb (diff) | |
parent | d9ed9e9fff25548f7aa85be5875c5d1998258198 (diff) | |
download | driver-core-cb6f0774a86f88e0ebd9ed8d2a6d232469d0cf5a.tar.gz driver-core-cb6f0774a86f88e0ebd9ed8d2a6d232469d0cf5a.tar.bz2 driver-core-cb6f0774a86f88e0ebd9ed8d2a6d232469d0cf5a.zip |
Merge pull request #60 from drivergroup/zsmith/docker-postgresv0.16.6
Move test-related database classes from core to test-utils
Diffstat (limited to 'src/main/scala/xyz')
-rw-r--r-- | src/main/scala/xyz/driver/core/database/database.scala | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/src/main/scala/xyz/driver/core/database/database.scala b/src/main/scala/xyz/driver/core/database/database.scala index dd2ed88..1dd0355 100644 --- a/src/main/scala/xyz/driver/core/database/database.scala +++ b/src/main/scala/xyz/driver/core/database/database.scala @@ -6,8 +6,6 @@ import xyz.driver.core.date.Date import xyz.driver.core.time.Time import scala.concurrent.Future -import scala.concurrent.ExecutionContext -import java.nio.file.{Files, Paths} import com.typesafe.config.Config package database { @@ -122,43 +120,6 @@ package database { def naturalKeyMapper[T] = MappedColumnType.base[Id[T], String](_.value, Id[T](_)) } - trait CreateAndDropSchema { - val slickDal: xyz.driver.core.database.SlickDal - val tables: GeneratedTables - - import tables.profile.api._ - import scala.concurrent.Await - import scala.concurrent.duration.Duration - - def createSchema(): Unit = { - Await.result(slickDal.execute(tables.createNamespaceSchema >> tables.schema.create), Duration.Inf) - } - - def dropSchema(): Unit = { - Await.result(slickDal.execute(tables.schema.drop >> tables.dropNamespaceSchema), Duration.Inf) - } - - def insertTestData(database: xyz.driver.core.database.Database, filePath: String)( - implicit executionContext: ExecutionContext): Future[Int] = { - - import database.profile.api.{DBIO => _, _} - - val file = Paths.get(filePath) - val sqlLine = new String(Files.readAllBytes(file), "UTF-8") - - slickDal.execute(sqlu"""CREATE PROCEDURE INSERT_TEST_DATA() - MODIFIES SQL DATA - BEGIN ATOMIC - #$sqlLine - END; - """).flatMap { _ => - slickDal.execute(sqlu"""{call INSERT_TEST_DATA()}""").flatMap { _ => - slickDal.execute(sqlu"""drop PROCEDURE INSERT_TEST_DATA;""") - } - } - } - } - trait DatabaseObject extends ColumnTypes { def createTables(): Future[Unit] def disconnect(): Unit |