pytrilogy 0.0.3.14__tar.gz → 0.0.3.16__tar.gz

{pytrilogy-0.0.3.14/pytrilogy.egg-info → pytrilogy-0.0.3.16}/PKG-INFO

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

{pytrilogy-0.0.3.14 → pytrilogy-0.0.3.16/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.14 → pytrilogy-0.0.3.16}/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.14"
+__version__ = "0.0.3.16"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.14 → pytrilogy-0.0.3.16}/trilogy/core/models/execute.py

@@ -305,14 +305,17 @@ class CTE(BaseModel):
         return self.source.name
 
     @property
-    def quote_address(self) -> bool:
-        if self.is_root_datasource:
-            candidate = self.source.datasources[0]
-            if isinstance(candidate, DATASOURCE_TYPES) and isinstance(
-                candidate.address, Address
-            ):
-                return candidate.address.quoted
-        return False
+    def quote_address(self) -> dict[str, bool]:
+
+        return {
+            candidate.safe_identifier: (
+                candidate.address.quoted and not candidate.address.is_query
+                if isinstance(candidate, BuildDatasource)
+                and isinstance(candidate.address, Address)
+                else False
+            )
+            for candidate in self.source.datasources
+        }
 
     @property
     def base_alias(self) -> str:
@@ -870,6 +873,7 @@ class Join(BaseModel):
     left_cte: CTE | None = None
     joinkey_pairs: List[CTEConceptPair] | None = None
     inlined_ctes: set[str] = Field(default_factory=set)
+    quote: str | None = None
 
     def inline_cte(self, cte: CTE):
         self.inlined_ctes.add(cte.name)
@@ -887,6 +891,10 @@ class Join(BaseModel):
 
     @property
     def right_ref(self) -> str:
+        if self.quote:
+            if self.right_cte.identifier in self.inlined_ctes:
+                return f"{self.quote}{self.right_cte.source.datasources[0].safe_location}{self.quote} as {self.right_cte.source.datasources[0].safe_identifier}"
+            return self.right_cte.safe_identifier
         if self.right_cte.identifier in self.inlined_ctes:
             return f"{self.right_cte.source.datasources[0].safe_location} as {self.right_cte.source.datasources[0].safe_identifier}"
         return self.right_cte.safe_identifier

{pytrilogy-0.0.3.14 → pytrilogy-0.0.3.16}/trilogy/core/processing/concept_strategies_v3.py

@@ -395,6 +395,7 @@ def generate_node(
             environment=environment,
             parents=[],
             depth=depth + 1,
+            preexisting_conditions=conditions.conditional if conditions else None,
         )
     elif concept.derivation == Derivation.BASIC:
         # this is special case handling for group bys
@@ -786,7 +787,6 @@ def _search_concepts(
         )
         # if anything we need to get is in the filter set and it's a computed value
         # we need to get _everything_ in this loop
-        logger.info(f"{[x.address for x in conditions.row_arguments]}")
         if any(
             [
                 x.derivation not in (Derivation.ROOT, Derivation.CONSTANT)

{pytrilogy-0.0.3.14 → pytrilogy-0.0.3.16}/trilogy/core/processing/node_generators/select_merge_node.py

@@ -405,6 +405,7 @@ def create_select_node(
             # no partial for constants
             partial_concepts=[],
             force_group=False,
+            preexisting_conditions=conditions.conditional if conditions else None,
         )
 
     datasource: dict[str, BuildDatasource | list[BuildDatasource]] = (
@@ -491,6 +492,7 @@ def gen_select_merge_node(
             depth=depth,
             partial_concepts=[],
             force_group=False,
+            preexisting_conditions=conditions.conditional if conditions else None,
         )
     for attempt in [False, True]:
         pruned_concept_graph = create_pruned_concept_graph(
@@ -542,6 +544,7 @@ def gen_select_merge_node(
                 depth=depth,
                 partial_concepts=[],
                 force_group=False,
+                preexisting_conditions=conditions.conditional if conditions else None,
             )
         )
 

{pytrilogy-0.0.3.14 → pytrilogy-0.0.3.16}/trilogy/dialect/base.py

@@ -156,7 +156,7 @@ FUNCTION_MAP = {
     FunctionType.PARENTHETICAL: lambda x: f"({x[0]})",
     # Complex
     FunctionType.INDEX_ACCESS: lambda x: f"{x[0]}[{x[1]}]",
-    FunctionType.MAP_ACCESS: lambda x: f"{x[0]}[{x[1]}][1]",
+    FunctionType.MAP_ACCESS: lambda x: f"{x[0]}[{x[1]}]",
     FunctionType.UNNEST: lambda x: f"unnest({x[0]})",
     FunctionType.ATTR_ACCESS: lambda x: f"""{x[0]}.{x[1].replace("'", "")}""",
     FunctionType.STRUCT: lambda x: f"{{{', '.join(struct_arg(x))}}}",
@@ -734,7 +734,7 @@ class BaseDialect:
             else:
                 source = None
         else:
-            if cte.quote_address:
+            if cte.quote_address.get(cte.source.datasources[0].safe_identifier, False):
                 source = f"{self.QUOTE_CHARACTER}{cte.base_name}{self.QUOTE_CHARACTER}"
             else:
                 source = cte.base_name
@@ -769,8 +769,8 @@ class BaseDialect:
                 base=f"{source}" if source else None,
                 grain=cte.grain,
                 limit=cte.limit,
-                # some joins may not need to be rendered
                 comment=cte.comment if CONFIG.show_comments else None,
+                # some joins may not need to be rendered
                 joins=[
                     j
                     for j in [

{pytrilogy-0.0.3.14 → pytrilogy-0.0.3.16}/trilogy/dialect/common.py

@@ -70,6 +70,8 @@ def render_join(
         return f"FULL JOIN {render_unnest(unnest_mode, quote_character, join.concept_to_unnest, render_func, cte)}"
     # left_name = join.left_name
     right_name = join.right_name
+    if cte.quote_address.get(join.right_name, False):
+        join.quote = quote_character
     right_base = join.right_ref
     base_joinkeys = []
     if join.joinkey_pairs:

{pytrilogy-0.0.3.14 → pytrilogy-0.0.3.16}/trilogy/dialect/duckdb.py

@@ -55,11 +55,14 @@ DUCKDB_TEMPLATE = Template(
 CREATE OR REPLACE TABLE {{ output.address.location }} AS
 {% endif %}{%- if ctes %}
 WITH {% for cte in ctes %}
-{{cte.name}} as ({{cte.statement}}){% if not loop.last %},{% endif %}{% endfor %}{% endif %}
-{%- if full_select -%}{{full_select}}
+{{cte.name}} as (
+{{cte.statement}}){% if not loop.last %},{% else %}
+{% endif %}{% endfor %}{% endif %}
+{%- if full_select -%}
+{{full_select}}
 {%- else -%}{%- if comment -%}
--- {{ comment }}{%- endif -%}
-SELECT
+-- {{ comment }}
+{%- endif %}SELECT
 {%- for select in select_columns %}
     {{ select }}{% if not loop.last %},{% endif %}{% endfor %}
 {% if base %}FROM