Merge pull request #108 from weswil07/fix-or-nonexistence

Disable query optimzation for 'OR nonexistence' cases.
mediapredict · Jan 25, 2023 · 7402703 · 7402703
2 parents 75939f2 + 49947b7
commit 7402703
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,6 @@ env
 /*.egg-info/
 /.idea
 /build
-/daffodil/*.c
+/daffodil/*.c
+*~
+*.so
diff --git a/daffodil/hstore_predicate.pyx b/daffodil/hstore_predicate.pyx
@@ -22,7 +22,7 @@ def forces_optimizer(children):
         return False
 
     return all(
-        isinstance(expr, ExpressionStr) and expr.daff_test == "?="
+        isinstance(expr, ExpressionStr) and expr.daff_test == "?=" and expr.daff_val == True
         for expr in children
     )
 

diff --git a/test/tests.py b/test/tests.py
@@ -567,6 +567,15 @@ def test_timestamp_notin(self):
             )
         """)
 
+    def test_or_nonexistence(self):
+        self.assert_filter_has_n_results(4, """
+            num_of_sat_test_takers = 50
+            [
+                non_existing ?= false
+                non_existing_too ?= false
+            ]
+        """)
+
 
     #def test_comparing_a_string_containing_int(self):
     #    self.assert_filter_has_n_results(417, """