diff options
Diffstat (limited to 'src/main/scala/xyz/driver/core')
-rw-r--r-- | src/main/scala/xyz/driver/core/database/Dal.scala | 59 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/database/database.scala (renamed from src/main/scala/xyz/driver/core/database.scala) | 59 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/database/package.scala | 8 |
3 files changed, 70 insertions, 56 deletions
diff --git a/src/main/scala/xyz/driver/core/database/Dal.scala b/src/main/scala/xyz/driver/core/database/Dal.scala new file mode 100644 index 0000000..b476c0d --- /dev/null +++ b/src/main/scala/xyz/driver/core/database/Dal.scala @@ -0,0 +1,59 @@ +package xyz.driver.core.database + +import scala.concurrent.{ExecutionContext, Future} + +import scalaz.{ListT, Monad, OptionT} +import scalaz.std.scalaFuture._ + +trait Dal { + protected type T[D] + protected implicit val monadT: Monad[T] + + protected def execute[D](operations: T[D]): Future[D] + protected def execute[D](readOperations: OptionT[T, D]): OptionT[Future, D] + protected def execute[D](readOperations: ListT[T, D]): ListT[Future, D] + protected def noAction[V](v: V): T[V] + protected def customAction[R](action: => Future[R]): T[R] +} + +class FutureDal(executionContext: ExecutionContext) extends Dal { + implicit val exec = executionContext + override type T[D] = Future[D] + implicit val monadT = implicitly[Monad[Future]] + + def execute[D](operations: T[D]): Future[D] = operations + def execute[D](operations: OptionT[T, D]): OptionT[Future, D] = OptionT(operations.run) + def execute[D](operations: ListT[T, D]): ListT[Future, D] = ListT(operations.run) + def noAction[V](v: V): T[V] = Future.successful(v) + def customAction[R](action: => Future[R]): T[R] = action +} + +class SlickDal(database: Database, executionContext: ExecutionContext) extends Dal { + import database.profile.api._ + implicit val exec = executionContext + override type T[D] = slick.dbio.DBIO[D] + + implicit protected class QueryOps[+E, U](query: Query[E, U, Seq]) { + def resultT: ListT[T, U] = ListT[T, U](query.result.map(_.toList)) + } + + override implicit val monadT: Monad[T] = new Monad[T] { + override def point[A](a: => A): T[A] = DBIO.successful(a) + override def bind[A, B](fa: T[A])(f: A => T[B]): T[B] = fa.flatMap(f) + } + + override def execute[D](readOperations: T[D]): Future[D] = { + database.database.run(readOperations.transactionally) + } + + override def execute[D](readOperations: OptionT[T, D]): OptionT[Future, D] = { + OptionT(database.database.run(readOperations.run.transactionally)) + } + + override def execute[D](readOperations: ListT[T, D]): ListT[Future, D] = { + ListT(database.database.run(readOperations.run.transactionally)) + } + + override def noAction[V](v: V): T[V] = DBIO.successful(v) + override def customAction[R](action: => Future[R]): T[R] = DBIO.from(action) +} diff --git a/src/main/scala/xyz/driver/core/database.scala b/src/main/scala/xyz/driver/core/database/database.scala index ee87784..3db9c9e 100644 --- a/src/main/scala/xyz/driver/core/database.scala +++ b/src/main/scala/xyz/driver/core/database/database.scala @@ -1,15 +1,13 @@ package xyz.driver.core +import scala.concurrent.Future + import slick.backend.DatabaseConfig -import slick.dbio.{DBIOAction, NoStream} import slick.driver.JdbcProfile import xyz.driver.core.time.Time import xyz.driver.core.date.Date -import scala.concurrent.{ExecutionContext, Future} -import scalaz.Monad - -object database { +package database { trait Database { val profile: JdbcProfile @@ -28,11 +26,6 @@ object database { } } - type Schema = { - def create: DBIOAction[Unit, NoStream, slick.dbio.Effect.Schema] - def drop: DBIOAction[Unit, NoStream, slick.dbio.Effect.Schema] - } - trait ColumnTypes { val profile: JdbcProfile import profile.api._ @@ -72,7 +65,6 @@ object database { } trait DatabaseObject extends ColumnTypes { - def createTables(): Future[Unit] def disconnect(): Unit } @@ -81,49 +73,4 @@ object database { def createTables(): Future[Unit] = Future.successful(()) def disconnect(): Unit = {} } - - trait Dal { - - type T[_] - implicit val monadT: Monad[T] - - def execute[D](operations: T[D]): Future[D] - def noAction[V](v: V): T[V] - def customAction[R](action: => Future[R]): T[R] - } - - class FutureDal(executionContext: ExecutionContext) extends Dal { - - implicit val exec = executionContext - - override type T[_] = Future[_] - implicit val monadT: Monad[T] = new Monad[T] { - override def point[A](a: => A): T[A] = Future(a) - override def bind[A, B](fa: T[A])(f: A => T[B]): T[B] = fa.flatMap(a => f(a.asInstanceOf[A])) - } - - def execute[D](operations: T[D]): Future[D] = operations.asInstanceOf[Future[D]] - def noAction[V](v: V): T[V] = Future.successful(v) - def customAction[R](action: => Future[R]): T[R] = action - } - - class SlickDal(database: Database, executionContext: ExecutionContext) extends Dal { - - import database.profile.api._ - - implicit val exec = executionContext - - override type T[_] = slick.dbio.DBIO[_] - val monadT: Monad[T] = new Monad[T] { - override def point[A](a: => A): T[A] = DBIO.successful(a) - override def bind[A, B](fa: T[A])(f: A => T[B]): T[B] = fa.flatMap(a => f(a.asInstanceOf[A])) - } - - def execute[D](readOperations: T[D]): Future[D] = { - database.database.run(readOperations.asInstanceOf[slick.dbio.DBIO[D]].transactionally) - } - - def noAction[V](v: V): slick.dbio.DBIO[V] = DBIO.successful(v) - def customAction[R](action: => Future[R]): T[R] = DBIO.from(action) - } } diff --git a/src/main/scala/xyz/driver/core/database/package.scala b/src/main/scala/xyz/driver/core/database/package.scala new file mode 100644 index 0000000..a664cff --- /dev/null +++ b/src/main/scala/xyz/driver/core/database/package.scala @@ -0,0 +1,8 @@ +import slick.dbio.{DBIOAction, NoStream} + +package object database { + type Schema = { + def create: DBIOAction[Unit, NoStream, slick.dbio.Effect.Schema] + def drop: DBIOAction[Unit, NoStream, slick.dbio.Effect.Schema] + } +} |