Merge pull request #921 from getquill/fix-918

fix nested option map
zio · Sep 24, 2017 · 1a52c2b · 1a52c2b
2 parents e716688 + 1769a68
commit 1a52c2b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/quill-core/src/main/scala/io/getquill/norm/FlattenOptionOperation.scala b/quill-core/src/main/scala/io/getquill/norm/FlattenOptionOperation.scala
@@ -9,7 +9,7 @@ object FlattenOptionOperation extends StatelessTransformer {
       case OptionMap(ast, alias, body) =>
         apply(BetaReduction(body, alias -> ast))
       case OptionForall(ast, alias, body) =>
-        val isEmpty = BinaryOperation(ast, EqualityOperator.`==`, NullValue)
+        val isEmpty = apply(BinaryOperation(ast, EqualityOperator.`==`, NullValue): Ast)
         val exists = apply(BetaReduction(body, alias -> ast))
         BinaryOperation(isEmpty, BooleanOperator.`||`, exists)
       case OptionExists(ast, alias, body) =>

diff --git a/quill-core/src/test/scala/io/getquill/norm/FlattenOptionOperationSpec.scala b/quill-core/src/test/scala/io/getquill/norm/FlattenOptionOperationSpec.scala
@@ -26,15 +26,24 @@ class FlattenOptionOperationSpec extends Spec {
           BinaryOperation(Ident("o"), EqualityOperator.`!=`, Constant(1))
         )
     }
-
+    "map + forall" in {
+      val q = quote {
+        (o: Option[TestEntity]) => o.map(_.i).forall(i => i != 1)
+      }
+      FlattenOptionOperation(q.ast.body: Ast) mustEqual
+        BinaryOperation(
+          BinaryOperation(Property(Ident("o"), "i"), EqualityOperator.`==`, NullValue),
+          BooleanOperator.`||`,
+          BinaryOperation(Property(Ident("o"), "i"), EqualityOperator.`!=`, Constant(1))
+        )
+    }
     "exists" in {
       val q = quote {
         (o: Option[Int]) => o.exists(i => i > 1)
       }
       FlattenOptionOperation(q.ast.body: Ast) mustEqual
         BinaryOperation(Ident("o"), NumericOperator.`>`, Constant(1))
     }
-
     "contains" in {
       val q = quote {
         (o: Option[Int]) => o.contains(1)

diff --git a/quill-sql/src/main/scala/io/getquill/context/sql/idiom/VerifySqlQuery.scala b/quill-sql/src/main/scala/io/getquill/context/sql/idiom/VerifySqlQuery.scala
@@ -51,7 +51,7 @@ object VerifySqlQuery {
           require(
             invalid.isEmpty,
             s"Found an `ON` table reference of a table that is not available: $invalid. " +
-              "The `ON` condition can only use tables defined through explicit joins.."
+              "The `ON` condition can only use tables defined through explicit joins."
           )
           nav
       }