Limit the use cases where WITH * is automatically injected.

Author: tonioo

neomodel/async_/match.py

@@ -436,6 +436,7 @@ def __init__(
         )
         self.is_count = is_count
         self.subgraph: dict = {}
+        self.mixed_filters: bool = False
 
 
 class AsyncQueryBuilder:
@@ -833,6 +834,7 @@ def add_to_target(statement: str, connector: Q, optional: bool) -> None:
             # everything into the one applied after OPTIONAL MATCH statements...
             opt_match_filters += match_filters
             match_filters = []
+            self._ast.mixed_filters = True
 
         ret = f" {q.connector} ".join(match_filters)
         if ret and q.negated:
@@ -949,8 +951,9 @@ def build_query(self) -> str:
             query += " OPTIONAL MATCH ".join(i for i in self._ast.optional_match)
 
         if self._ast.optional_where:
-            # Make sure filtering works as expected with optional match, even if it's not performant...
-            query += " WITH *"
+            if self._ast.mixed_filters:
+                # Make sure filtering works as expected with optional match, even if it's not performant...
+                query += " WITH *"
             query += " WHERE "
             query += " AND ".join(self._ast.optional_where)
 

neomodel/sync_/match.py

@@ -434,6 +434,7 @@ def __init__(
         )
         self.is_count = is_count
         self.subgraph: dict = {}
+        self.mixed_filters: bool = False
 
 
 class QueryBuilder:
@@ -831,6 +832,7 @@ def add_to_target(statement: str, connector: Q, optional: bool) -> None:
             # everything into the one applied after OPTIONAL MATCH statements...
             opt_match_filters += match_filters
             match_filters = []
+            self._ast.mixed_filters = True
 
         ret = f" {q.connector} ".join(match_filters)
         if ret and q.negated:
@@ -947,8 +949,9 @@ def build_query(self) -> str:
             query += " OPTIONAL MATCH ".join(i for i in self._ast.optional_match)
 
         if self._ast.optional_where:
-            # Make sure filtering works as expected with optional match, even if it's not performant...
-            query += " WITH *"
+            if self._ast.mixed_filters:
+                # Make sure filtering works as expected with optional match, even if it's not performant...
+                query += " WITH *"
             query += " WHERE "
             query += " AND ".join(self._ast.optional_where)
 

test/async_/test_match_api.py

@@ -553,6 +553,17 @@ async def test_q_filters():
     )
     assert len(latte_or_robusta_coffee) == 2
 
+    robusta_coffee = (
+        await Coffee.nodes.fetch_relations(Optional("species"))
+        .filter(species__name="Robusta")
+        .all()
+    )
+    # Since we first do a MATCH on Coffee, the filter which is applied after the
+    # OPTIONAL MATCH is useless because we don't inject any WITH * statement in this
+    # case.
+    # So, that's the result we expect...
+    assert len(robusta_coffee) == 6
+
     class QQ:
         pass
 

test/sync_/test_match_api.py

@@ -549,6 +549,17 @@ def test_q_filters():
     )
     assert len(latte_or_robusta_coffee) == 2
 
+    robusta_coffee = (
+        Coffee.nodes.fetch_relations(Optional("species"))
+        .filter(species__name="Robusta")
+        .all()
+    )
+    # Since we first do a MATCH on Coffee, the filter which is applied after the
+    # OPTIONAL MATCH is useless because we don't inject any WITH * statement in this
+    # case.
+    # So, that's the result we expect...
+    assert len(robusta_coffee) == 6
+
     class QQ:
         pass