diff options
author | Vlad Uspensky <v.uspenskiy@icloud.com> | 2017-08-24 11:55:17 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-24 11:55:17 -0700 |
commit | ef33866655cd392c16ba42fe1fcb10aa0cd21f42 (patch) | |
tree | e505da362d85a9b6a434655d9adaf32b0112aa27 /src | |
parent | cb6f0774a86f88e0ebd9ed8d2a6d232469d0cf5a (diff) | |
parent | 71227b121c421e35002a8a6aea715bbd4fd44bcd (diff) | |
download | driver-core-ef33866655cd392c16ba42fe1fcb10aa0cd21f42.tar.gz driver-core-ef33866655cd392c16ba42fe1fcb10aa0cd21f42.tar.bz2 driver-core-ef33866655cd392c16ba42fe1fcb10aa0cd21f42.zip |
Merge pull request #61 from drivergroup/monadT-mockingv0.16.7
Making Dal monadT mockable for SlickDal
Diffstat (limited to 'src')
-rw-r--r-- | src/main/scala/xyz/driver/core/database/Dal.scala | 6 |
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) } |