pytrilogy 0.0.2.44__py3-none-any.whl → 0.0.2.46__py3-none-any.whl

{pytrilogy-0.0.2.44.dist-info → pytrilogy-0.0.2.46.dist-info}/METADATA

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

{pytrilogy-0.0.2.44.dist-info → pytrilogy-0.0.2.46.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trilogy/__init__.py,sha256=fIzmFgsTur7NoKb9nhIHJxXi92LDugIbBG7NvACkML0,291
+trilogy/__init__.py,sha256=q-cYTIW_OeTndnX4REcP9y6FQJIbng3ilR-7zaKPUyc,291
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=UPymm94T2c6a55XdDaXw0aleTe1pOJ6lf6gOWLKZyKg,1430
 trilogy/engine.py,sha256=R5ubIxYyrxRExz07aZCUfrTsoXCHQ8DKFTDsobXdWdA,1102
@@ -16,7 +16,7 @@ trilogy/core/exceptions.py,sha256=1c1lQCwSw4_5CQS3q7scOkXU8GQvullJXfPHubprl90,61
 trilogy/core/functions.py,sha256=IhVpt3n6wEanKHnGu3oA2w6-hKIlxWpEyz7fHN66mpo,10720
 trilogy/core/graph_models.py,sha256=mameUTiuCajtihDw_2-W218xyJlvTusOWrEKP1yAWgk,2003
 trilogy/core/internal.py,sha256=jNGFHKENnbMiMCtAgsnLZYVSENDK4b5ALecXFZpTDzQ,1075
-trilogy/core/models.py,sha256=Fos3AY_biCCYh-Y9p-n9di8CJ9UvdxnNgiNTxYjlH-4,163631
+trilogy/core/models.py,sha256=WxmOgW0cTUgcBVu_gLPUwA9j3KWYPH5FsxKzBSJukEg,164085
 trilogy/core/optimization.py,sha256=VFSvJLNoCCOraip-PZUKeE4qrlxtXARjQUzJZiW-yRk,7325
 trilogy/core/query_processor.py,sha256=mbcZlgjChrRjDHkdmMbKe-T70UpbBkJhS09MyU5a6UY,17785
 trilogy/core/optimizations/__init__.py,sha256=bWQecbeiwiDx9LJnLsa7dkWxdbl2wcnkcTN69JyP8iI,356
@@ -50,7 +50,7 @@ trilogy/core/processing/nodes/select_node_v2.py,sha256=7WoFxeGEAzhpS4y4Zw2nH2tt7
 trilogy/core/processing/nodes/unnest_node.py,sha256=mAmFluzm2yeeiQ6NfIB7BU_8atRGh-UJfPf9ROwbhr8,2152
 trilogy/core/processing/nodes/window_node.py,sha256=ro0QfMFi4ZmIn5Q4D0M_vJWfnHH_C0MN7XkVkx8Gygg,1214
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=Aj0U5JUFPzBuo-5LNASYIkJVIYiMhL3A4nGEslY7xAg,36301
+trilogy/dialect/base.py,sha256=YyJy20CNJfOmuHg-WhYEwIamJzAQxb48_lqghriTm8c,36261
 trilogy/dialect/bigquery.py,sha256=15KJ-cOpBlk9O7FPviPgmg8xIydJeKx7WfmL3SSsPE8,2953
 trilogy/dialect/common.py,sha256=eqJi_Si1iyb2sV0siTf8g8JOHueWu6RkdtQZtutKazk,3826
 trilogy/dialect/config.py,sha256=tLVEMctaTDhUgARKXUNfHUcIolGaALkQ0RavUvXAY4w,2994
@@ -75,9 +75,9 @@ trilogy/parsing/render.py,sha256=-qqpXQg4yHcv284Vosjnsc_vrPveH6oaYbeCd3ZSvs0,156
 trilogy/parsing/trilogy.lark,sha256=B6NM3-rBHtYB_WSEti0DiS8Z-I8YH3kZU47xNzQvBx4,12389
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=PHxvv6f2ODv0esyyhWxlARgra8dVhqQhYl0lTrSyVNo,3729
-pytrilogy-0.0.2.44.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.44.dist-info/METADATA,sha256=RxCccw965AUjLdlWfAfnBSub9kBZAD5Hh-qJgcY9i90,8426
-pytrilogy-0.0.2.44.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pytrilogy-0.0.2.44.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.44.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.44.dist-info/RECORD,,
+pytrilogy-0.0.2.46.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.2.46.dist-info/METADATA,sha256=L7_5Dv6L1KqiOvLlUnSRzmGZajKdmZ3p_TMYt2Y5iq8,8426
+pytrilogy-0.0.2.46.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pytrilogy-0.0.2.46.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.2.46.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.2.46.dist-info/RECORD,,

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.44"
+__version__ = "0.0.2.46"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/models.py

@@ -2307,9 +2307,11 @@ class UnnestJoin(BaseModel):
     rendering_required: bool = True
 
     def __hash__(self):
-        return (
-            self.alias + "".join([str(s.address) for s in self.concepts])
-        ).__hash__()
+        return self.safe_identifier.__hash__()
+
+    @property
+    def safe_identifier(self) -> str:
+        return self.alias + "".join([str(s.address) for s in self.concepts])
 
 
 class InstantiatedUnnestJoin(BaseModel):
@@ -2544,7 +2546,7 @@ class QueryDatasource(BaseModel):
                 return True
         return False
 
-    def __add__(self, other):
+    def __add__(self, other) -> "QueryDatasource":
         # these are syntax errors to avoid being caught by current
         if not isinstance(other, QueryDatasource):
             raise SyntaxError("Can only merge two query datasources")
@@ -2570,7 +2572,7 @@ class QueryDatasource(BaseModel):
             f" {other.name} with {[c.address for c in other.output_concepts]} concepts"
         )
 
-        merged_datasources = {}
+        merged_datasources: dict[str, Union[Datasource, "QueryDatasource"]] = {}
 
         for ds in [*self.datasources, *other.datasources]:
             if ds.safe_identifier in merged_datasources:
@@ -2580,20 +2582,29 @@ class QueryDatasource(BaseModel):
             else:
                 merged_datasources[ds.safe_identifier] = ds
 
-        final_source_map = defaultdict(set)
+        final_source_map: defaultdict[
+            str, Set[Union[Datasource, "QueryDatasource", "UnnestJoin"]]
+        ] = defaultdict(set)
+
+        # add our sources
         for key in self.source_map:
             final_source_map[key] = self.source_map[key].union(
                 other.source_map.get(key, set())
             )
+        # add their sources
         for key in other.source_map:
             if key not in final_source_map:
                 final_source_map[key] = other.source_map[key]
+
+        # if a ds was merged (to combine columns), we need to update the source map
+        # to use the merged item
         for k, v in final_source_map.items():
             final_source_map[k] = set(
-                merged_datasources[x.safe_identifier] for x in list(v)
+                merged_datasources.get(x.safe_identifier, x) for x in list(v)
             )
         self_hidden = self.hidden_concepts or []
         other_hidden = other.hidden_concepts or []
+        # hidden is the minimum overlapping set
         hidden = [x for x in self_hidden if x.address in other_hidden]
         qds = QueryDatasource(
             input_concepts=unique(
@@ -2606,11 +2617,10 @@ class QueryDatasource(BaseModel):
             datasources=list(merged_datasources.values()),
             grain=self.grain,
             joins=unique(self.joins + other.joins, "unique_id"),
-            # joins = self.joins,
             condition=(
                 self.condition + other.condition
-                if (self.condition or other.condition)
-                else None
+                if self.condition and other.condition
+                else self.condition or other.condition
             ),
             source_type=self.source_type,
             partial_concepts=unique(

trilogy/dialect/base.py

@@ -313,10 +313,18 @@ class BaseDialect:
                     )
                     for x in c.lineage.over
                 ]
-                rval = f"{self.WINDOW_FUNCTION_MAP[c.lineage.type](concept = self.render_concept_sql(c.lineage.content,
-                                                                                                      cte=cte, alias=False, raise_invalid=raise_invalid), 
-                                                                   window=','.join(rendered_over_components), sort=','.join(rendered_order_components), 
-                                                                   offset=c.lineage.index)}"  # noqa: E501
+
+                rval = self.WINDOW_FUNCTION_MAP[c.lineage.type](
+                    concept=self.render_concept_sql(
+                        c.lineage.content,
+                        cte=cte,
+                        alias=False,
+                        raise_invalid=raise_invalid,
+                    ),
+                    window=",".join(rendered_over_components),
+                    sort=",".join(rendered_order_components),
+                    offset=c.lineage.index,
+                )
             elif isinstance(c.lineage, FilterItem):
                 # for cases when we've optimized this
                 if cte.condition == c.lineage.where.conditional: