aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/core/database/Dal.scala
diff options
context:
space:
mode:
authorvlad <vlad@driver.xyz>2017-08-24 10:57:55 -0700
committervlad <vlad@driver.xyz>2017-08-24 10:57:55 -0700
commit71227b121c421e35002a8a6aea715bbd4fd44bcd (patch)
tree4c9ae7021a2715181b3fc8b6d13a2f2967193bb8 /src/main/scala/xyz/driver/core/database/Dal.scala
parenta8685a0df2705e320cf5f0ba780878bb972e59bb (diff)
downloaddriver-core-71227b121c421e35002a8a6aea715bbd4fd44bcd.tar.gz
driver-core-71227b121c421e35002a8a6aea715bbd4fd44bcd.tar.bz2
driver-core-71227b121c421e35002a8a6aea715bbd4fd44bcd.zip
Making Dal monadT mockable for SlickDal
Diffstat (limited to 'src/main/scala/xyz/driver/core/database/Dal.scala')
-rw-r--r--src/main/scala/xyz/driver/core/database/Dal.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/core/database/Dal.scala b/src/main/scala/xyz/driver/core/database/Dal.scala
index ed72d3b..52f8477 100644
--- a/src/main/scala/xyz/driver/core/database/Dal.scala
+++ b/src/main/scala/xyz/driver/core/database/Dal.scala
@@ -8,7 +8,7 @@ import scalaz.std.scalaFuture._
trait Dal {
type T[D]
- implicit val monadT: Monad[T]
+ implicit def monadT: Monad[T]
def execute[D](operations: T[D]): Future[D]
def noAction[V](v: V): T[V]
@@ -42,11 +42,13 @@ class SlickDal(database: Database, executionContext: ExecutionContext) extends D
def resultT: ListT[T, U] = ListT.listT[T](compiledQuery.result.map(_.toList))
}
- override implicit val monadT: Monad[T] = new Monad[T] {
+ private val dbioMonad = 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 implicit def monadT: Monad[T] = dbioMonad
+
override def execute[D](readOperations: T[D]): Future[D] = {
database.database.run(readOperations.transactionally)
}