Merge pull request #996 from mentegy/fix-async-regres

Return failed future instead of exception in cassandra async prepare
zio · Dec 15, 2017 · 46ed299 · 46ed299
2 parents d67c733 + 2d47a9b
commit 46ed299
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/quill-cassandra/src/main/scala/io/getquill/CassandraAsyncContext.scala b/quill-cassandra/src/main/scala/io/getquill/CassandraAsyncContext.scala
@@ -36,20 +36,23 @@ class CassandraAsyncContext[N <: NamingStrategy](
     super.performIO(io)
   }
 
-  def executeQuery[T](cql: String, prepare: Prepare = identityPrepare, extractor: Extractor[T] = identityExtractor)(implicit ec: ExecutionContext): Future[List[T]] = {
-    val (params, bs) = prepare(super.prepare(cql))
-    logger.logQuery(cql, params)
-    session.executeAsync(bs)
-      .map(_.all.asScala.toList.map(extractor))
-  }
+  def executeQuery[T](cql: String, prepare: Prepare = identityPrepare, extractor: Extractor[T] = identityExtractor)(implicit ec: ExecutionContext): Future[List[T]] =
+    Future(prepare(super.prepare(cql))).flatMap {
+      case (params, bs) =>
+        logger.logQuery(cql, params)
+        session.executeAsync(bs)
+          .map(_.all.asScala.toList.map(extractor))
+    }
 
   def executeQuerySingle[T](cql: String, prepare: Prepare = identityPrepare, extractor: Extractor[T] = identityExtractor)(implicit ec: ExecutionContext): Future[T] =
     executeQuery(cql, prepare, extractor).map(handleSingleResult)
 
   def executeAction[T](cql: String, prepare: Prepare = identityPrepare)(implicit ec: ExecutionContext): Future[Unit] = {
-    val (params, bs) = prepare(super.prepare(cql))
-    logger.logQuery(cql, params)
-    session.executeAsync(bs).map(_ => ())
+    Future(prepare(super.prepare(cql))).flatMap {
+      case (params, bs) =>
+        logger.logQuery(cql, params)
+        session.executeAsync(bs).map(_ => ())
+    }
   }
 
   def executeBatchAction(groups: List[BatchGroup])(implicit ec: ExecutionContext): Future[Unit] =

diff --git a/quill-cassandra/src/test/scala/io/getquill/context/cassandra/CassandraContextSpec.scala b/quill-cassandra/src/test/scala/io/getquill/context/cassandra/CassandraContextSpec.scala
@@ -3,7 +3,7 @@ package io.getquill.context.cassandra
 import io.getquill._
 
 import scala.concurrent.ExecutionContext.Implicits.{ global => ec }
-import scala.util.Success
+import scala.util.{ Success, Try }
 
 class CassandraContextSpec extends Spec {
 
@@ -39,4 +39,17 @@ class CassandraContextSpec extends Spec {
   "probe" in {
     testSyncDB.probe("SELECT * FROM TestEntity") mustBe Success(())
   }
+
+  "return failed future on `prepare` error in async context" - {
+    "query" - {
+      val f = testAsyncDB.executeQuery("bad cql")
+      Try(await(f)).isFailure mustEqual true
+      ()
+    }
+    "action" - {
+      val f = testAsyncDB.executeAction("bad cql")
+      Try(await(f)).isFailure mustEqual true
+      ()
+    }
+  }
 }