pytrilogy 0.0.3.45__tar.gz → 0.0.3.46__tar.gz

{pytrilogy-0.0.3.45/pytrilogy.egg-info → pytrilogy-0.0.3.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.45
+Version: 0.0.3.46
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 

{pytrilogy-0.0.3.45 → pytrilogy-0.0.3.46/pytrilogy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.45
+Version: 0.0.3.46
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 

{pytrilogy-0.0.3.45 → pytrilogy-0.0.3.46}/tests/test_partial_handling.py

@@ -12,7 +12,7 @@ from trilogy.core.processing.concept_strategies_v3 import History, search_concep
 from trilogy.core.processing.node_generators import (
     gen_filter_node,
 )
-from trilogy.core.processing.nodes import MergeNode
+from trilogy.core.processing.nodes import FilterNode
 from trilogy.core.query_processor import generate_graph
 from trilogy.hooks.query_debugger import DebuggingHook
 
@@ -139,8 +139,8 @@ def test_partial_assignment():
         g=g,
         depth=0,
     )
-    assert isinstance(sourced, MergeNode)
-    assert len(sourced.parents) == 2
+    assert isinstance(sourced, FilterNode)
+    assert len(sourced.parents) == 1
 
 
 def test_filter_query():

{pytrilogy-0.0.3.45 → pytrilogy-0.0.3.46}/trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.dialect.enums import Dialects
 from trilogy.executor import Executor
 from trilogy.parser import parse
 
-__version__ = "0.0.3.45"
+__version__ = "0.0.3.46"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.45 → pytrilogy-0.0.3.46}/trilogy/core/processing/node_generators/filter_node.py

@@ -56,12 +56,40 @@ def gen_filter_node(
                 continue
         if conditions and conditions == where:
             optional_included.append(x)
+
+    # sometimes, it's okay to include other local optional above the filter
+    # in case it is, prep our list
+    extra_row_level_optional: list[BuildConcept] = []
+    for x in local_optional:
+        if x.address in optional_included:
+            continue
+        extra_row_level_optional.append(x)
+
+    # this flag controls whether we materialize the filter as a where on the prior CTE
+    # or do the filtering inline as a case statement
+    optimized_pushdown = False
+    if not is_scalar_condition(where.conditional):
+        optimized_pushdown = False
+    elif not local_optional:
+        optimized_pushdown = True
+    elif conditions and conditions == where:
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} query conditions are the same as filter conditions, can optimize across all concepts"
+        )
+        optimized_pushdown = True
+    elif optional_included == local_optional:
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} all optional concepts are included in the filter, can optimize across all concepts"
+        )
+        optimized_pushdown = True
     logger.info(
         f"{padding(depth)}{LOGGER_PREFIX} filter `{concept}` condition `{concept.lineage.where}` derived from {immediate_parent.address} row parents {[x.address for x in parent_row_concepts]} and {[[y.address] for x  in parent_existence_concepts for y  in x]} existence parents"
     )
     # we'll populate this with the row parent
     # and the existence parent(s)
     core_parents = []
+    if not optimized_pushdown:
+        parent_row_concepts += extra_row_level_optional
 
     row_parent: StrategyNode = source_concepts(
         mandatory_list=parent_row_concepts,
@@ -99,21 +127,6 @@ def gen_filter_node(
         )
         return None
 
-    optimized_pushdown = False
-    if not is_scalar_condition(where.conditional):
-        optimized_pushdown = False
-    elif not local_optional:
-        optimized_pushdown = True
-    elif conditions and conditions == where:
-        logger.info(
-            f"{padding(depth)}{LOGGER_PREFIX} query conditions are the same as filter conditions, can optimize across all concepts"
-        )
-        optimized_pushdown = True
-    elif optional_included == local_optional:
-        logger.info(
-            f"{padding(depth)}{LOGGER_PREFIX} all optional concepts are included in the filter, can optimize across all concepts"
-        )
-        optimized_pushdown = True
     if optimized_pushdown:
         logger.info(
             f"{padding(depth)}{LOGGER_PREFIX} returning optimized filter node with pushdown to parent with condition {where.conditional}"
@@ -193,7 +206,9 @@ def gen_filter_node(
             + optional_outputs
         )
         return filter_node
-
+    logger.info(
+        f"{padding(depth)}{LOGGER_PREFIX} need to enrich filter node with additional concepts {[x.address for x in local_optional if x.address not in filter_node.output_concepts]}"
+    )
     enrich_node: StrategyNode = source_concepts(  # this fetches the parent + join keys
         # to then connect to the rest of the query
         mandatory_list=[immediate_parent] + parent_row_concepts + local_optional,