pytrilogy 0.0.2.43__tar.gz → 0.0.2.45__tar.gz

{pytrilogy-0.0.2.43/pytrilogy.egg-info → pytrilogy-0.0.2.45}/PKG-INFO

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

{pytrilogy-0.0.2.43 → pytrilogy-0.0.2.45/pytrilogy.egg-info}/PKG-INFO

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

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

{pytrilogy-0.0.2.43 → pytrilogy-0.0.2.45}/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(

{pytrilogy-0.0.2.43 → pytrilogy-0.0.2.45}/trilogy/core/processing/node_generators/multiselect_node.py

@@ -3,6 +3,7 @@ from trilogy.core.models import (
     Environment,
     MultiSelectStatement,
     WhereClause,
+    Conditional,
 )
 from trilogy.core.processing.nodes import MergeNode, NodeJoin, History
 from trilogy.core.processing.nodes.base_node import concept_list_to_grain, StrategyNode
@@ -14,7 +15,7 @@ from trilogy.core.processing.utility import padding
 from trilogy.core.processing.utility import concept_to_relevant_joins
 from collections import defaultdict
 from itertools import combinations
-from trilogy.core.enums import Purpose
+from trilogy.core.enums import Purpose, BooleanOperator
 from trilogy.core.processing.node_generators.common import resolve_join_order
 
 LOGGER_PREFIX = "[GEN_MULTISELECT_NODE]"
@@ -76,14 +77,22 @@ def gen_multiselect_node(
             g=g,
             depth=depth + 1,
             history=history,
+            conditions=select.where_clause,
         )
         if not snode:
             logger.info(
                 f"{padding(depth)}{LOGGER_PREFIX} Cannot generate multiselect node for {concept}"
             )
             return None
-        if select.where_clause:
-            snode.conditions = select.where_clause.conditional
+        if select.having_clause:
+            if snode.conditions:
+                snode.conditions = Conditional(
+                    left=snode.conditions,
+                    right=select.having_clause.conditional,
+                    operator=BooleanOperator.AND,
+                )
+            else:
+                snode.conditions = select.having_clause.conditional
         merge_concepts = []
         for x in [*snode.output_concepts]:
             merge = lineage.get_merge_concept(x)

{pytrilogy-0.0.2.43 → pytrilogy-0.0.2.45}/trilogy/core/processing/node_generators/select_merge_node.py

@@ -20,6 +20,9 @@ from trilogy.core.graph_models import concept_to_node
 from trilogy.constants import logger
 from trilogy.core.processing.utility import padding
 from trilogy.core.enums import PurposeLineage
+from trilogy.core.processing.nodes.base_node import (
+    concept_list_to_grain,
+)
 
 LOGGER_PREFIX = "[GEN_ROOT_MERGE_NODE]"
 
@@ -353,7 +356,7 @@ def gen_select_merge_node(
         ]
     ):
         preexisting_conditions = conditions.conditional
-    return MergeNode(
+    base = MergeNode(
         output_concepts=all_concepts,
         input_concepts=non_constant,
         environment=environment,
@@ -362,3 +365,16 @@ def gen_select_merge_node(
         parents=parents,
         preexisting_conditions=preexisting_conditions,
     )
+    target_grain = concept_list_to_grain(all_concepts, [])
+    if not base.resolve().grain.issubset(target_grain):
+        return GroupNode(
+            output_concepts=all_concepts,
+            input_concepts=all_concepts,
+            environment=environment,
+            g=g,
+            parents=[base],
+            depth=depth,
+            preexisting_conditions=preexisting_conditions,
+            partial_concepts=base.partial_concepts,
+        )
+    return base