pytrilogy 0.0.2.4__tar.gz → 0.0.2.5__tar.gz

{pytrilogy-0.0.2.4/pytrilogy.egg-info → pytrilogy-0.0.2.5}/PKG-INFO

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

{pytrilogy-0.0.2.4 → pytrilogy-0.0.2.5/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.2.4 → pytrilogy-0.0.2.5}/tests/test_where_clause.py

@@ -227,5 +227,34 @@ where
     select: SelectStatement = parsed[-1]
 
     assert is_scalar_condition(select.where_clause.conditional) is False
-    query = BaseDialect().compile_statement(process_query(test_environment, select))
-    print(query)
+    _ = BaseDialect().compile_statement(process_query(test_environment, select))
+
+
+def test_case_where(test_environment):
+    from trilogy.hooks.query_debugger import DebuggingHook
+
+    declarations = """property order_id_even_name <- CASE
+    when order_id %2 = 0 then 'even'
+    else 'odd'
+    END;
+
+const test <- 1;
+    
+auto order_even_class_filter <- filter category_id where order_id_even_name = 'even' and 1= test; 
+
+select
+    category_id,
+    category_name
+where
+    category_name like '%abc%' and category_id not in order_even_class_filter
+    and category_id = test
+;"""
+    env, parsed = parse(declarations, environment=test_environment)
+    select: SelectStatement = parsed[-1]
+
+    query = BaseDialect().compile_statement(
+        process_query(test_environment, select, hooks=[DebuggingHook()])
+    )
+
+    # check to make sure our subselect is well-formed
+    assert "`category_id` not in (select" in query, query

{pytrilogy-0.0.2.4 → pytrilogy-0.0.2.5}/trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.executor import Executor
 from trilogy.parser import parse
 from trilogy.constants import CONFIG
 
-__version__ = "0.0.2.4"
+__version__ = "0.0.2.5"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.2.4 → pytrilogy-0.0.2.5}/trilogy/core/models.py

@@ -2433,7 +2433,13 @@ class CTE(BaseModel):
         # if we've entirely removed the need to join to someplace to get the concept
         # drop the join as well.
         for removed_cte in removed:
-            still_required = any([removed_cte in x for x in self.source_map.values()])
+            still_required = any(
+                [
+                    removed_cte in x
+                    for x in self.source_map.values()
+                    or self.existence_source_map.values()
+                ]
+            )
             if not still_required:
                 self.joins = [
                     join
@@ -2451,6 +2457,7 @@ class CTE(BaseModel):
                     candidates = [x.name for x in self.parent_ctes]
                     self.base_name_override = candidates[0] if candidates else None
                     self.base_alias_override = candidates[0] if candidates else None
+        return True
 
     def inline_parent_datasource(self, parent: CTE, force_group: bool = False) -> bool:
         qds_being_inlined = parent.source
@@ -3315,7 +3322,7 @@ class Comparison(
             and self.operator == other.operator
         )
 
-    def inline_constant(self, constant: Concept) -> "Comparison":
+    def inline_constant(self, constant: Concept):
         assert isinstance(constant.lineage, Function)
         new_val = constant.lineage.arguments[0]
         if isinstance(self.left, ConstantInlineable):
@@ -3332,10 +3339,7 @@ class Comparison(
         else:
             new_right = self.right
 
-        if self.right == constant:
-            new_right = new_val
-
-        return Comparison(
+        return self.__class__(
             left=new_left,
             right=new_right,
             operator=self.operator,

{pytrilogy-0.0.2.4 → pytrilogy-0.0.2.5}/trilogy/core/optimizations/inline_datasource.py

@@ -43,10 +43,14 @@ class InlineDatasource(OptimizationRule):
                 continue
             root_outputs = {x.address for x in root.output_concepts}
             cte_outputs = {x.address for x in cte.output_columns}
+            inherited = {x for x, v in cte.source_map.items() if v}
             # cte_inherited_outputs = {x.address for x in parent_cte.output_columns if parent_cte.source_map.get(x.address)}
             grain_components = {x.address for x in root.grain.components}
-            if not cte_outputs.issubset(root_outputs):
-                self.log(f"Not all {parent_cte.name} outputs are found on datasource")
+            if not inherited.issubset(root_outputs):
+                cte_missing = inherited - root_outputs
+                self.log(
+                    f"Not all {parent_cte.name} require inputs are found on datasource, missing {cte_missing}"
+                )
                 continue
             if not grain_components.issubset(cte_outputs):
                 self.log("Not all datasource components in cte outputs, forcing group")

{pytrilogy-0.0.2.4 → pytrilogy-0.0.2.5}/trilogy/dialect/base.py

@@ -188,10 +188,11 @@ FUNCTION_GRAIN_MATCH_MAP = {
 GENERIC_SQL_TEMPLATE = Template(
     """{%- if ctes %}
 WITH {% for cte in ctes %}
-{{cte.name}} as ({{cte.statement}}){% if not loop.last %},{% endif %}{% endfor %}{% endif %}
+{{cte.name}} as (
+{{cte.statement}}){% if not loop.last %},{% endif %}{% endfor %}{% endif %}
 {%- if full_select -%}
 {{full_select}}
-{%- else -%}
+{% else -%}
 SELECT
 {%- if limit is not none %}
 TOP {{ limit }}{% endif %}

{pytrilogy-0.0.2.4 → pytrilogy-0.0.2.5}/trilogy/dialect/duckdb.py

@@ -49,7 +49,6 @@ WITH {% for cte in ctes %}
 {{cte.name}} as ({{cte.statement}}){% if not loop.last %},{% endif %}{% endfor %}{% endif %}
 {% if full_select -%}{{full_select}}
 {% else -%}
-
 SELECT
 {%- for select in select_columns %}
     {{ select }}{% if not loop.last %},{% endif %}{% endfor %}