From a6bd52df4ac75865528d9c87c7be15723879506c Mon Sep 17 00:00:00 2001 From: vlad Date: Wed, 9 Nov 2016 15:18:50 -0800 Subject: Rollback for Database standard table creation method --- src/main/scala/xyz/driver/core/database.scala | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'src/main/scala/xyz/driver/core/database.scala') diff --git a/src/main/scala/xyz/driver/core/database.scala b/src/main/scala/xyz/driver/core/database.scala index 0ebcd0d..85a8cc4 100644 --- a/src/main/scala/xyz/driver/core/database.scala +++ b/src/main/scala/xyz/driver/core/database.scala @@ -5,8 +5,7 @@ import slick.dbio.{DBIOAction, NoStream} import slick.driver.JdbcProfile import xyz.driver.core.time.Time -import scala.concurrent.{ExecutionContext, Future} -import scala.language.reflectiveCalls +import scala.concurrent.Future object database { @@ -48,20 +47,20 @@ object database { trait DatabaseObject extends IdColumnTypes { - implicit val exec: ExecutionContext +// implicit val exec: ExecutionContext def createTables(): Future[Unit] def disconnect(): Unit - def ensureTableExist(schemas: Seq[Schema]): Future[Unit] = - for { - dropping <- Future.sequence(schemas.map { schema => - database.database.run(schema.drop).recover { case _: Throwable => () } - }) - creation <- Future.sequence(schemas.map { schema => - database.database.run(schema.create).recover { case _: Throwable => () } - }) - } yield () +// def ensureTableExist(schemas: Seq[Schema]): Future[Unit] = +// for { +// dropping <- Future.sequence(schemas.map { schema => +// database.database.run(schema.drop).recover { case _: Throwable => () } +// }) +// creation <- Future.sequence(schemas.map { schema => +// database.database.run(schema.create).recover { case _: Throwable => () } +// }) +// } yield () } abstract class DatabaseObjectAdapter extends DatabaseObject { -- cgit v1.2.3