pytrilogy 0.0.2.4__tar.gz → 0.0.2.6__tar.gz

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

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

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

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

{pytrilogy-0.0.2.4 → pytrilogy-0.0.2.6}/tests/test_parsing.py

@@ -160,7 +160,8 @@ address `preqldata.analytics_411641820.events_*`
 ;"""
     )
     query = parsed[-1]
-    assert query.address.location == "`preqldata.analytics_411641820.events_*`"
+    assert query.address.quoted is True
+    assert query.address.location == "preqldata.analytics_411641820.events_*"
 
 
 def test_purpose_and_keys():
@@ -448,3 +449,46 @@ select
         {"a": 1, "b": 2, "c": 3},
         1,
     )
+
+
+def test_datasource_colon():
+
+    text = """
+key x int;
+key y int;
+
+datasource test (
+x:x,
+y:y)
+grain(x)
+address `abc:def`
+;
+
+
+select x;
+"""
+    env, parsed = parse_text(text)
+
+    results = Dialects.DUCK_DB.default_executor().generate_sql(text)[0]
+
+    assert '"abc:def" as test' in results
+
+    text = """
+key x int;
+key y int;
+
+datasource test (
+x:x,
+y:y)
+grain(x)
+address abcdef
+;
+
+
+select x;
+"""
+    env, parsed = parse_text(text)
+
+    results = Dialects.DUCK_DB.default_executor().generate_sql(text)[0]
+
+    assert "abcdef as test" in results, results

{pytrilogy-0.0.2.4 → pytrilogy-0.0.2.6}/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.6}/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.6"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.2.4 → pytrilogy-0.0.2.6}/trilogy/core/enums.py

@@ -7,6 +7,7 @@ class UnnestMode(Enum):
     DIRECT = "direct"
     CROSS_APPLY = "cross_apply"
     CROSS_JOIN = "cross_join"
+    CROSS_JOIN_ALIAS = "cross_join_alias"
 
 
 class ConceptSource(Enum):

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

@@ -1817,6 +1817,7 @@ class MultiSelectStatement(SelectTypeMixin, Mergeable, Namespaced, BaseModel):
 class Address(BaseModel):
     location: str
     is_query: bool = False
+    quoted: bool = False
 
 
 class Query(BaseModel):
@@ -2433,7 +2434,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 +2458,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
@@ -2572,6 +2580,16 @@ class CTE(BaseModel):
             return self.relevant_base_ctes[0].name
         return self.source.name
 
+    @property
+    def quote_address(self) -> bool:
+        if self.is_root_datasource:
+            candidate = self.source.datasources[0]
+            if isinstance(candidate, Datasource) and isinstance(
+                candidate.address, Address
+            ):
+                return candidate.address.quoted
+        return False
+
     @property
     def base_alias(self) -> str:
         if self.base_alias_override:
@@ -3315,7 +3333,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 +3350,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.6}/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.6}/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 %}
@@ -498,10 +499,12 @@ class BaseDialect:
                 for c in cte.output_columns
                 if c.address not in [y.address for y in cte.hidden_concepts]
             ]
-        if cte.base_name == cte.base_alias:
-            source = cte.base_name
+        if cte.quote_address:
+            source = f"{self.QUOTE_CHARACTER}{cte.base_name}{self.QUOTE_CHARACTER}"
         else:
-            source = f"{cte.base_name} as {cte.base_alias}"
+            source = cte.base_name
+        if cte.base_name != cte.base_alias:
+            source = f"{source} as {cte.base_alias}"
         return CompiledCTE(
             name=cte.name,
             statement=self.SQL_TEMPLATE.render(

{pytrilogy-0.0.2.4 → pytrilogy-0.0.2.6}/trilogy/dialect/common.py

@@ -26,7 +26,8 @@ def render_join(
             raise ValueError("must provide a cte to build an unnest joins")
         if unnest_mode == UnnestMode.CROSS_JOIN:
             return f"CROSS JOIN {render_func(join.concept, cte, False)} as {quote_character}{join.concept.safe_address}{quote_character}"
-
+        if unnest_mode == UnnestMode.CROSS_JOIN_ALIAS:
+            return f"CROSS JOIN {render_func(join.concept, cte, False)} as array_unnest ({quote_character}{join.concept.safe_address}{quote_character})"
         return f"FULL JOIN {render_func(join.concept, cte, False)} as unnest_wrapper({quote_character}{join.concept.safe_address}{quote_character})"
     left_name = join.left_name
     right_name = join.right_name

{pytrilogy-0.0.2.4 → pytrilogy-0.0.2.6}/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 %}

{pytrilogy-0.0.2.4 → pytrilogy-0.0.2.6}/trilogy/dialect/presto.py

@@ -5,7 +5,7 @@ from jinja2 import Template
 from trilogy.core.enums import FunctionType, WindowType
 from trilogy.dialect.base import BaseDialect
 from trilogy.core.models import DataType
-
+from trilogy.core.enums import UnnestMode
 
 WINDOW_FUNCTION_MAP: Mapping[WindowType, Callable[[Any, Any, Any], str]] = {}
 
@@ -86,6 +86,7 @@ class PrestoDialect(BaseDialect):
     QUOTE_CHARACTER = '"'
     SQL_TEMPLATE = SQL_TEMPLATE
     DATATYPE_MAP = {**BaseDialect.DATATYPE_MAP, DataType.NUMERIC: "DECIMAL"}
+    UNNEST_MODE = UnnestMode.CROSS_JOIN
 
 
 class TrinoDialect(PrestoDialect):

{pytrilogy-0.0.2.4 → pytrilogy-0.0.2.6}/trilogy/parsing/parse_engine.py

@@ -297,8 +297,11 @@ class ParseToObjects(Transformer):
     def concept_lit(self, args) -> Concept:
         return self.environment.concepts.__getitem__(args[0])
 
-    def ADDRESS(self, args) -> str:
-        return args.value
+    def ADDRESS(self, args) -> Address:
+        return Address(location=args.value, quoted=False)
+
+    def QUOTED_ADDRESS(self, args) -> Address:
+        return Address(location=args.value[1:-1], quoted=True)
 
     def STRING_CHARS(self, args) -> str:
         return args.value
@@ -1010,7 +1013,7 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def address(self, meta: Meta, args):
-        return Address(location=args[0])
+        return args[0]
 
     @v_args(meta=True)
     def query(self, meta: Meta, args):

{pytrilogy-0.0.2.4 → pytrilogy-0.0.2.6}/trilogy/parsing/trilogy.lark

@@ -39,7 +39,7 @@
     
     grain_clause: "grain" "(" column_list ")"
     
-    address: "address" ADDRESS
+    address: "address" (QUOTED_ADDRESS | ADDRESS)
     
     query: "query" MULTILINE_STRING
     
@@ -258,7 +258,8 @@
     // base language constructs
     concept_lit: IDENTIFIER
     IDENTIFIER: /[a-zA-Z\_][a-zA-Z0-9\_\-\.\-]*/
-    ADDRESS: IDENTIFIER | /`[a-zA-Z\_][a-zA-Z0-9\_\-\.\-\*]*`/
+    QUOTED_ADDRESS:  /`[a-zA-Z\_][a-zA-Z0-9\_\-\.\-\*\:]*`/
+    ADDRESS: IDENTIFIER
 
     MULTILINE_STRING: /\'{3}(.*?)\'{3}/s