pytrilogy 0.0.2.8__py3-none-any.whl → 0.0.2.10__py3-none-any.whl

{pytrilogy-0.0.2.8.dist-info → pytrilogy-0.0.2.10.dist-info}/METADATA

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

{pytrilogy-0.0.2.8.dist-info → pytrilogy-0.0.2.10.dist-info}/RECORD

@@ -1,6 +1,6 @@
-trilogy/__init__.py,sha256=zJsrRvfQaVItXzGc-5Fgqgq2jhQrGMrKaI1adR7HE84,290
+trilogy/__init__.py,sha256=-fwTLWZDBATA0SPkOXcsRS3py_W_F1oq7wt2cVysbNg,291
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/constants.py,sha256=3YKp-xvS7yB5z9t9YDcGofkrdZ6v13iePDnn4O5mwTE,886
+trilogy/constants.py,sha256=HRQq4i3cpSEJCywt61QKEzRO1jd4tEPZNSBuxUA_7yg,922
 trilogy/engine.py,sha256=R5ubIxYyrxRExz07aZCUfrTsoXCHQ8DKFTDsobXdWdA,1102
 trilogy/executor.py,sha256=5cRbU4Rj7p1pNV76rfp1pz704Hx_0q8_O8HFURjgXxQ,11016
 trilogy/parser.py,sha256=UtuqSiGiCjpMAYgo1bvNq-b7NSzCA5hzbUW31RXaMII,281
@@ -16,44 +16,44 @@ trilogy/core/exceptions.py,sha256=NvV_4qLOgKXbpotgRf7c8BANDEvHxlqRPaA53IThQ2o,56
 trilogy/core/functions.py,sha256=ARJAyBjeS415-54k3G_bx807rkPZonEulMaLRxSP7vU,10371
 trilogy/core/graph_models.py,sha256=oJUMSpmYhqXlavckHLpR07GJxuQ8dZ1VbB1fB0KaS8c,2036
 trilogy/core/internal.py,sha256=jNGFHKENnbMiMCtAgsnLZYVSENDK4b5ALecXFZpTDzQ,1075
-trilogy/core/models.py,sha256=ubtmdVsm_7QkigbvlAXEe7SXbZB502GLean0jFu8VLU,139884
-trilogy/core/optimization.py,sha256=A8S9C9H5RcQcFSQLYtEEBnm-r1CW_e9GEWlLK7q3MqA,4930
-trilogy/core/query_processor.py,sha256=fIRJWLBfMeKZ_o1-QB2rsQ8jZwsd9zxYkZ5QQzkGBus,17678
+trilogy/core/models.py,sha256=mjORKd_RFvNc_c7QqCHCM4GrJSb5VA50tMqo7fX5-Bw,142855
+trilogy/core/optimization.py,sha256=RJmDr2f9hyFePF-B6LpmHkj69-AzUm-nNtvO59899O8,6601
+trilogy/core/query_processor.py,sha256=N5Jdbb8D8_mdeJufIch0uCbfuf2psSSkLxGXwC5CqCg,18663
 trilogy/core/optimizations/__init__.py,sha256=pxRzNzd2g8oRMy4f_ub5va6bNS2pd4hnyp9JBzTKc1E,300
 trilogy/core/optimizations/base_optimization.py,sha256=tWWT-xnTbnEU-mNi_isMNbywm8B9WTRsNFwGpeh3rqE,468
 trilogy/core/optimizations/inline_constant.py,sha256=kHNyc2UoaPVdYfVAPAFwnWuk4sJ_IF5faRtVcDOrBtw,1110
-trilogy/core/optimizations/inline_datasource.py,sha256=PyThSsQeZ6fi5sM2mUprC8kXXKo1sP8qLVwaGqpFDJI,3428
-trilogy/core/optimizations/predicate_pushdown.py,sha256=iVZV_BVaL3I6wlELPOuJAiuF0heOM7bCUnNqyCxxRVw,6370
+trilogy/core/optimizations/inline_datasource.py,sha256=AATzQ6YrtW_1-aQFjQyTYqEYKBoMFhek7ADfBr4uUdQ,3634
+trilogy/core/optimizations/predicate_pushdown.py,sha256=4Y6zfJN3VVexkD6p9IYWN4BTL8RwW6hyNb0VQZ8ETdI,8020
 trilogy/core/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/processing/concept_strategies_v3.py,sha256=A0-RVwoqD06gUapGRD4SANj3g9hniKPWs7LvqyeHtbg,24445
+trilogy/core/processing/concept_strategies_v3.py,sha256=yjCiGKzghjAc0E0QAcdJ1Xr5RXHAQL2zMPOz-dMhEzM,25431
 trilogy/core/processing/graph_utils.py,sha256=aq-kqk4Iado2HywDxWEejWc-7PGO6Oa-ZQLAM6XWPHw,1199
-trilogy/core/processing/utility.py,sha256=rhnkn3KgB1MW17mZYSEZ8XFEbC__B7PPmZgpDql4Myg,13614
+trilogy/core/processing/utility.py,sha256=15Qi68ktmnQmMt5jxrpueQ34oG5fSSgst3kIEejwF8A,14519
 trilogy/core/processing/node_generators/__init__.py,sha256=-mzYkRsaRNa_dfTckYkKVFSR8h8a3ihEiPJDU_tAmDo,672
 trilogy/core/processing/node_generators/basic_node.py,sha256=4242PNGTCm2tklqMIkqVu5Iv4m_IeTnOYXxDveuCDZM,2856
-trilogy/core/processing/node_generators/common.py,sha256=Z3R5Ucb0s09pzs3lkz-t9sI2A5R-SIum1UdwGvqKpXA,8975
-trilogy/core/processing/node_generators/filter_node.py,sha256=0zey11fmXhI-ihkv-cK43tUKHlwG10cHYogByOnGbiw,5433
-trilogy/core/processing/node_generators/group_node.py,sha256=u9X0gAEY7AAWwYsK4g3jPgxcTwSSlI1uDQqNIY6vfG8,2988
+trilogy/core/processing/node_generators/common.py,sha256=lDBRq9X6dQ_xSwXxLLNDq2pW8D-XwAY-ylTJLMugkLw,9525
+trilogy/core/processing/node_generators/filter_node.py,sha256=N8PoPvj-_ZQbucTyNqpZ1EyPTDAy6oB7DuEYCQxQBOs,7411
+trilogy/core/processing/node_generators/group_node.py,sha256=JwT8qYeGbozrZNGAlpndc9aaIN7K9ROYkkc2rAS8Qz8,3079
 trilogy/core/processing/node_generators/group_to_node.py,sha256=nzITnhaALIT7FMonyo16nNo-kSrLfefa9sZBYecrvkU,2887
 trilogy/core/processing/node_generators/multiselect_node.py,sha256=vP84dnLQy6dtypi6mUbt9sMAcmmrTgQ1Oz4GI6X1IEo,6421
 trilogy/core/processing/node_generators/node_merge_node.py,sha256=yZ75lsl8RtM8kr-XQxqZEU6fm-JN5DTJxNbneayu36c,12319
-trilogy/core/processing/node_generators/rowset_node.py,sha256=wFkzQtXfudvAGifySvobgc9Qo1usTEEKpSbjkzchNy0,6282
-trilogy/core/processing/node_generators/select_node.py,sha256=XGcz74XsWv5POWhV2gGC_jbi7T9g7sY-VtP3sjlppFc,19057
-trilogy/core/processing/node_generators/unnest_node.py,sha256=6CH66eGwpadNX7TzUhWZ8aqIisOtQeHINbLV6X3QBUk,1779
-trilogy/core/processing/node_generators/window_node.py,sha256=9nXUXUgQrNczU1gaOqhOZPNzCUxw-lkxt0R7HORI6ss,2582
-trilogy/core/processing/nodes/__init__.py,sha256=-8ONG7Nqa6sNLpst5wNNyMigyaHRfUKGdE3xce8E3mM,3998
-trilogy/core/processing/nodes/base_node.py,sha256=7AeDm9WK3uiDGUL6QefeZ8Ok9OcWhbh5h1f9K0hr8IQ,11191
-trilogy/core/processing/nodes/filter_node.py,sha256=stY0tkppSdfCD43ZKRfCxfX9XxdLJ9gEtDA2_wPDcGE,1962
-trilogy/core/processing/nodes/group_node.py,sha256=j3vtFQIn_t4EfCke8dGULlwVkG2KKPYfgGwo2rvgcww,6322
-trilogy/core/processing/nodes/merge_node.py,sha256=RAuBPHPIQcGHqyU_R4HT6Kq9E40fWjQoOUCIngLEGQI,14629
-trilogy/core/processing/nodes/select_node_v2.py,sha256=COu-WPuyabGAc3HTkJB-_7eNzR4OgxIL4YDuZIRrST0,7179
+trilogy/core/processing/node_generators/rowset_node.py,sha256=6KVnuk75mRzWJ-jIk7e8azN8BIPPuCn-VxPlxDqfPVE,4616
+trilogy/core/processing/node_generators/select_node.py,sha256=E8bKOAUpwLwZy1iiaFVD5sM4XK-eFpHgijdyIWLMyH4,18904
+trilogy/core/processing/node_generators/unnest_node.py,sha256=gHjurhr86JFkbq6vxTHDQGDKt95EdotSFHVKgrR_Z3Q,1860
+trilogy/core/processing/node_generators/window_node.py,sha256=lFfmEjX_mLB7MuOM6CuKNnks1CabokGImpwhbQzjnkE,3283
+trilogy/core/processing/nodes/__init__.py,sha256=jyduHk96j5fpju72sc8swOiBjR3Md866kt8JZGkp3ZU,4866
+trilogy/core/processing/nodes/base_node.py,sha256=KVLAPLlo5QQq9Cm6lTLsqLN7l8EyXGxQkKrZFHdyRp8,12871
+trilogy/core/processing/nodes/filter_node.py,sha256=DBOSGFfkiILrZa1BlLv2uxUSkgWtSIKiZplqyKXPjg8,2132
+trilogy/core/processing/nodes/group_node.py,sha256=RKqODYxbY8wmClvI8-k3UgXWL7qQv5Hxhz5AB-RVUu0,6344
+trilogy/core/processing/nodes/merge_node.py,sha256=ZUcFIm5v4hip_Ml_oJXqVMrevUkE62wvPrvCrO9FWAc,14272
+trilogy/core/processing/nodes/select_node_v2.py,sha256=QuXNcwgjTRYamOoIooGrp4ie6INcqA9whtC5LZWjD8s,7180
 trilogy/core/processing/nodes/unnest_node.py,sha256=JFtm90IVM-46aCYkTNIaJah6v9ApAfonjVhcVM1HmDE,1903
 trilogy/core/processing/nodes/window_node.py,sha256=X7qxLUKd3tekjUUsmH_4vz5b-U89gMnGd04VBxuu2Ns,1280
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=kamdgq1zTO2bF3bMAfvNZBNO3LKP-n2kYXPJKM6fMzw,30102
+trilogy/dialect/base.py,sha256=_WKy2YJyDZdelHVX4mcnwKzAp2J-56UjoBpS5hG2yrg,30819
 trilogy/dialect/bigquery.py,sha256=15KJ-cOpBlk9O7FPviPgmg8xIydJeKx7WfmL3SSsPE8,2953
 trilogy/dialect/common.py,sha256=HVNPL8dGyQjT2REruV5C2YPpBbVR7KlD0akVM7GcuPI,3329
 trilogy/dialect/config.py,sha256=tLVEMctaTDhUgARKXUNfHUcIolGaALkQ0RavUvXAY4w,2994
-trilogy/dialect/duckdb.py,sha256=2ERqiG2owb3uvmU90Bdo1e2fq4ICWC3we2RUQpHVPwg,3173
+trilogy/dialect/duckdb.py,sha256=u_gpL35kouWxoBLas1h0ABYY2QzlVtEh22hm5h0lCOM,3182
 trilogy/dialect/enums.py,sha256=4NdpsydBpDn6jnh0JzFz5VvQEtnShErWtWHVyT6TNpw,3948
 trilogy/dialect/postgres.py,sha256=ev1RJZsC8BB3vJSxJ4q-TTYqZ4Hk1NXUtuRkLrQEBX0,3254
 trilogy/dialect/presto.py,sha256=2Rs53UfPxKU0rJTcEbiS-Lxm-CDiqUGojh7yRpQgyRE,3416
@@ -69,14 +69,14 @@ trilogy/parsing/common.py,sha256=zNd5buKxK4z9WSszOk4zOI0GexDFukzZtdNfQxg3kVw,621
 trilogy/parsing/config.py,sha256=Z-DaefdKhPDmSXLgg5V4pebhSB0h590vI0_VtHnlukI,111
 trilogy/parsing/exceptions.py,sha256=92E5i2frv5hj9wxObJZsZqj5T6bglvPzvdvco_vW1Zk,38
 trilogy/parsing/helpers.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-trilogy/parsing/parse_engine.py,sha256=cIoQuDGaCx_HYgNjOvG6GDVGOu5pcLBylZsK-wy5r6Q,61098
+trilogy/parsing/parse_engine.py,sha256=TD7dr9f4ffRcNB0BpzgaACqc-gD3Hy4_pOyLA7rmK7A,62563
 trilogy/parsing/render.py,sha256=Gy_6wVYPwYLf35Iota08sbqveuWILtUhI8MYStcvtJM,12174
-trilogy/parsing/trilogy.lark,sha256=cUcwxUTlxU7jKFzYEXYARLTsPHG5cVLk-Xhltw6m2lY,11357
+trilogy/parsing/trilogy.lark,sha256=kj1DXkqRFAb20PXN4gGDtXtQI61nUv1U8nfPWSWCr1Y,11407
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=PHxvv6f2ODv0esyyhWxlARgra8dVhqQhYl0lTrSyVNo,3729
-pytrilogy-0.0.2.8.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.8.dist-info/METADATA,sha256=bKl-Q_qHdoiH1rJZDDBXD425zCYaNShnuPioYKxBTAA,7906
-pytrilogy-0.0.2.8.dist-info/WHEEL,sha256=uCRv0ZEik_232NlR4YDw4Pv3Ajt5bKvMH13NUU7hFuI,91
-pytrilogy-0.0.2.8.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.8.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.8.dist-info/RECORD,,
+pytrilogy-0.0.2.10.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.2.10.dist-info/METADATA,sha256=sH_c8ZeuuG6nuSMIrKQvhLoHi67-4qWu3DZ5KM27FJQ,7907
+pytrilogy-0.0.2.10.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+pytrilogy-0.0.2.10.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.2.10.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.2.10.dist-info/RECORD,,

{pytrilogy-0.0.2.8.dist-info → pytrilogy-0.0.2.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.1)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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

trilogy/constants.py

@@ -24,6 +24,7 @@ class Optimizations:
     predicate_pushdown: bool = True
     datasource_inlining: bool = True
     constant_inlining: bool = True
+    constant_inline_cutoff: int = 3
     direct_return: bool = True
 
 

trilogy/core/models.py

@@ -70,7 +70,7 @@ from trilogy.utility import unique
 from collections import UserList, UserDict
 from functools import cached_property
 from abc import ABC
-
+from collections import defaultdict
 
 LOGGER_PREFIX = "[MODELS]"
 
@@ -154,7 +154,10 @@ class ConceptArgs(ABC):
 class SelectContext(ABC):
 
     def with_select_context(
-        self, grain: Grain, conditional: Conditional | Comparison | Parenthetical | None
+        self,
+        grain: Grain,
+        conditional: Conditional | Comparison | Parenthetical | None,
+        environment: Environment | None = None,
     ):
         raise NotImplementedError
 
@@ -166,6 +169,7 @@ class ConstantInlineable(ABC):
 
 class SelectTypeMixin(BaseModel):
     where_clause: Union["WhereClause", None] = Field(default=None)
+    having_clause: Union["HavingClause", None] = Field(default=None)
 
     @property
     def output_components(self) -> List[Concept]:
@@ -595,13 +599,16 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
         self,
         grain: Optional["Grain"] = None,
         conditional: Conditional | Comparison | Parenthetical | None = None,
+        environment: Environment | None = None,
     ) -> "Concept":
         if not all([isinstance(x, Concept) for x in self.keys or []]):
             raise ValueError(f"Invalid keys {self.keys} for concept {self.address}")
         new_grain = grain or self.grain
         new_lineage = self.lineage
         if isinstance(self.lineage, SelectContext):
-            new_lineage = self.lineage.with_select_context(new_grain, conditional)
+            new_lineage = self.lineage.with_select_context(
+                new_grain, conditional, environment=environment
+            )
         return self.__class__(
             name=self.name,
             datatype=self.datatype,
@@ -788,7 +795,9 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
         return Granularity.MULTI_ROW
 
     def with_filter(
-        self, condition: "Conditional | Comparison | Parenthetical"
+        self,
+        condition: "Conditional | Comparison | Parenthetical",
+        environment: Environment | None = None,
     ) -> "Concept":
         from trilogy.utility import string_to_hash
 
@@ -805,12 +814,15 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
             modifiers=self.modifiers,
             pseudonyms=self.pseudonyms,
         )
+        if environment:
+            environment.add_concept(new)
         return new
 
 
 class Grain(Mergeable, BaseModel):
     nested: bool = False
     components: List[Concept] = Field(default_factory=list, validate_default=True)
+    where_clause: Optional[WhereClause] = Field(default=None)
 
     @field_validator("components")
     def component_validator(cls, v, info: ValidationInfo):
@@ -836,10 +848,12 @@ class Grain(Mergeable, BaseModel):
 
     def __str__(self):
         if self.abstract:
-            return (
-                "Grain<Abstract" + ",".join([c.address for c in self.components]) + ">"
-            )
-        return "Grain<" + ",".join([c.address for c in self.components]) + ">"
+            base = "Grain<Abstract>"
+        else:
+            base = "Grain<" + ",".join([c.address for c in self.components]) + ">"
+        if self.where_clause:
+            base += f"|{str(self.where_clause)}"
+        return base
 
     def with_namespace(self, namespace: str) -> "Grain":
         return Grain(
@@ -1046,12 +1060,15 @@ class Function(Mergeable, Namespaced, SelectContext, BaseModel):
         return self.output_datatype
 
     def with_select_context(
-        self, grain: Grain, conditional: Conditional | Comparison | Parenthetical | None
+        self,
+        grain: Grain,
+        conditional: Conditional | Comparison | Parenthetical | None,
+        environment: Environment | None = None,
     ) -> Function:
         if self.operator in FunctionClass.AGGREGATE_FUNCTIONS.value and conditional:
             base = [
                 (
-                    c.with_select_context(grain, conditional)
+                    c.with_select_context(grain, conditional, environment)
                     if isinstance(
                         c,
                         SelectContext,
@@ -1061,7 +1078,7 @@ class Function(Mergeable, Namespaced, SelectContext, BaseModel):
                 for c in self.arguments
             ]
             final = [
-                c.with_filter(conditional) if isinstance(c, Concept) else c
+                c.with_filter(conditional, environment) if isinstance(c, Concept) else c
                 for c in base
             ]
             return Function(
@@ -1077,7 +1094,7 @@ class Function(Mergeable, Namespaced, SelectContext, BaseModel):
             operator=self.operator,
             arguments=[
                 (
-                    c.with_select_context(grain, conditional)
+                    c.with_select_context(grain, conditional, environment)
                     if isinstance(
                         c,
                         SelectContext,
@@ -1293,13 +1310,22 @@ class WindowItem(Mergeable, Namespaced, SelectContext, BaseModel):
         )
 
     def with_select_context(
-        self, grain: Grain, conditional: Conditional | Comparison | Parenthetical | None
+        self,
+        grain: Grain,
+        conditional: Conditional | Comparison | Parenthetical | None,
+        environment: Environment | None = None,
     ) -> "WindowItem":
         return WindowItem(
             type=self.type,
-            content=self.content.with_select_context(grain, conditional),
-            over=[x.with_select_context(grain, conditional) for x in self.over],
-            order_by=[x.with_select_context(grain, conditional) for x in self.order_by],
+            content=self.content.with_select_context(grain, conditional, environment),
+            over=[
+                x.with_select_context(grain, conditional, environment)
+                for x in self.over
+            ],
+            order_by=[
+                x.with_select_context(grain, conditional, environment)
+                for x in self.order_by
+            ],
         )
 
     @property
@@ -1368,11 +1394,14 @@ class FilterItem(Namespaced, SelectContext, BaseModel):
         )
 
     def with_select_context(
-        self, grain: Grain, conditional: Conditional | Comparison | Parenthetical | None
+        self,
+        grain: Grain,
+        conditional: Conditional | Comparison | Parenthetical | None,
+        environment: Environment | None = None,
     ) -> FilterItem:
         return FilterItem(
-            content=self.content.with_select_context(grain, conditional),
-            where=self.where.with_select_context(grain, conditional),
+            content=self.content.with_select_context(grain, conditional, environment),
+            where=self.where.with_select_context(grain, conditional, environment),
         )
 
     @property
@@ -1452,9 +1481,17 @@ class OrderItem(Mergeable, SelectContext, Namespaced, BaseModel):
         return OrderItem(expr=self.expr.with_namespace(namespace), order=self.order)
 
     def with_select_context(
-        self, grain: Grain, conditional: Conditional | Comparison | Parenthetical | None
+        self,
+        grain: Grain,
+        conditional: Conditional | Comparison | Parenthetical | None,
+        environment: Environment | None = None,
     ) -> "OrderItem":
-        return OrderItem(expr=self.expr.with_grain(grain), order=self.order)
+        return OrderItem(
+            expr=self.expr.with_select_context(
+                grain, conditional=conditional, environment=environment
+            ),
+            order=self.order,
+        )
 
     def with_merge(
         self, source: Concept, target: Concept, modifiers: List[Modifier]
@@ -1643,7 +1680,9 @@ class SelectStatement(Mergeable, Namespaced, SelectTypeMixin, BaseModel):
                 )
             ):
                 output.append(item)
-        return Grain(components=unique(output, "address"))
+        return Grain(
+            components=unique(output, "address"), where_clause=self.where_clause
+        )
 
     def with_namespace(self, namespace: str) -> "SelectStatement":
         return SelectStatement(
@@ -1988,7 +2027,7 @@ class Datasource(Namespaced, BaseModel):
         return self.__repr__()
 
     def __hash__(self):
-        return (self.namespace + self.identifier).__hash__()
+        return self.full_name.__hash__()
 
     def with_namespace(self, namespace: str):
         new_namespace = (
@@ -2173,9 +2212,9 @@ class BaseJoin(BaseModel):
 class QueryDatasource(BaseModel):
     input_concepts: List[Concept]
     output_concepts: List[Concept]
+    datasources: List[Union[Datasource, "QueryDatasource"]]
     source_map: Dict[str, Set[Union[Datasource, "QueryDatasource", "UnnestJoin"]]]
 
-    datasources: List[Union[Datasource, "QueryDatasource"]]
     grain: Grain
     joins: List[BaseJoin | UnnestJoin]
     limit: Optional[int] = None
@@ -2227,19 +2266,16 @@ class QueryDatasource(BaseModel):
 
     @field_validator("source_map")
     @classmethod
-    def validate_source_map(cls, v, info: ValidationInfo):
+    def validate_source_map(cls, v: dict, info: ValidationInfo):
         values = info.data
-        expected = {c.address for c in values["output_concepts"]}.union(
-            c.address for c in values["input_concepts"]
-        )
-        seen = set()
-        for k, _ in v.items():
-            seen.add(k)
-        for x in expected:
-            if x not in seen and CONFIG.validate_missing:
-                raise SyntaxError(
-                    f"source map missing {x} on (expected {expected}, have {seen})"
-                )
+        for key in ("input_concepts", "output_concepts"):
+            if not values.get(key):
+                continue
+            for concept in values[key]:
+                if concept.address not in v and CONFIG.validate_missing:
+                    raise SyntaxError(
+                        f"Missing source map for {concept.address} on {key}, have {v}"
+                    )
         return v
 
     def __str__(self):
@@ -2308,11 +2344,23 @@ class QueryDatasource(BaseModel):
         )
 
         merged_datasources = {}
+
         for ds in [*self.datasources, *other.datasources]:
             if ds.full_name in merged_datasources:
                 merged_datasources[ds.full_name] = merged_datasources[ds.full_name] + ds
             else:
                 merged_datasources[ds.full_name] = ds
+
+        final_source_map = defaultdict(set)
+        for key in self.source_map:
+            final_source_map[key] = self.source_map[key].union(
+                other.source_map.get(key, set())
+            )
+        for key in other.source_map:
+            if key not in final_source_map:
+                final_source_map[key] = other.source_map[key]
+        for k, v in final_source_map.items():
+            final_source_map[k] = set(merged_datasources[x.full_name] for x in list(v))
         qds = QueryDatasource(
             input_concepts=unique(
                 self.input_concepts + other.input_concepts, "address"
@@ -2320,7 +2368,7 @@ class QueryDatasource(BaseModel):
             output_concepts=unique(
                 self.output_concepts + other.output_concepts, "address"
             ),
-            source_map={**self.source_map, **other.source_map},
+            source_map=final_source_map,
             datasources=list(merged_datasources.values()),
             grain=self.grain,
             joins=unique(self.joins + other.joins, "unique_id"),
@@ -2849,6 +2897,7 @@ class UndefinedConcept(Concept, Mergeable, Namespaced):
         self,
         grain: Optional["Grain"] = None,
         conditional: Conditional | Comparison | Parenthetical | None = None,
+        environment: Environment | None = None,
     ) -> "UndefinedConcept":
         if not all([isinstance(x, Concept) for x in self.keys or []]):
             raise ValueError(f"Invalid keys {self.keys} for concept {self.address}")
@@ -2856,7 +2905,9 @@ class UndefinedConcept(Concept, Mergeable, Namespaced):
         if self.lineage:
             new_lineage = self.lineage
             if isinstance(self.lineage, SelectContext):
-                new_lineage = self.lineage.with_select_context(new_grain, conditional)
+                new_lineage = self.lineage.with_select_context(
+                    new_grain, conditional, environment
+                )
         else:
             new_lineage = None
         return self.__class__(
@@ -3299,7 +3350,9 @@ class LazyEnvironment(Environment):
         ) or name.startswith("_"):
             return super().__getattribute__(name)
         if not self.loaded:
-            print(f"lazily evaluating load path {self.load_path} to access {name}")
+            logger.info(
+                f"lazily evaluating load path {self.load_path} to access {name}"
+            )
             from trilogy import parse
 
             env = Environment(working_path=str(self.working_path))
@@ -3441,16 +3494,23 @@ class Comparison(
         )
 
     def with_select_context(
-        self, grain: Grain, conditional: Conditional | Comparison | Parenthetical | None
+        self,
+        grain: Grain,
+        conditional: Conditional | Comparison | Parenthetical | None,
+        environment: Environment | None = None,
     ):
         return self.__class__(
             left=(
-                self.left.with_select_context(grain, conditional)
+                self.left.with_select_context(grain, conditional, environment)
                 if isinstance(self.left, SelectContext)
                 else self.left
             ),
             # the right side does NOT need to inherit select grain
-            right=self.right,
+            right=(
+                self.right.with_select_context(grain, conditional, environment)
+                if isinstance(self.right, SelectContext)
+                else self.right
+            ),
             operator=self.operator,
         )
 
@@ -3534,12 +3594,15 @@ class SubselectComparison(Comparison):
         return [tuple(get_concept_arguments(self.right))]
 
     def with_select_context(
-        self, grain: Grain, conditional: Conditional | Comparison | Parenthetical | None
+        self,
+        grain: Grain,
+        conditional: Conditional | Comparison | Parenthetical | None,
+        environment: Environment | None = None,
     ):
-        # there's no need to pass the select grain through to a subselect comparison
+        # there's no need to pass the select grain through to a subselect comparison on the right
         return self.__class__(
             left=(
-                self.left.with_select_context(grain, conditional)
+                self.left.with_select_context(grain, conditional, environment)
                 if isinstance(self.left, SelectContext)
                 else self.left
             ),
@@ -3570,12 +3633,17 @@ class CaseWhen(Namespaced, SelectContext, BaseModel):
         )
 
     def with_select_context(
-        self, grain: Grain, conditional: Conditional | Comparison | Parenthetical | None
+        self,
+        grain: Grain,
+        conditional: Conditional | Comparison | Parenthetical | None,
+        environment: Environment | None = None,
     ) -> CaseWhen:
         return CaseWhen(
-            comparison=self.comparison.with_select_context(grain, conditional),
+            comparison=self.comparison.with_select_context(
+                grain, conditional, environment
+            ),
             expr=(
-                (self.expr.with_select_context(grain, conditional))
+                (self.expr.with_select_context(grain, conditional, environment))
                 if isinstance(self.expr, SelectContext)
                 else self.expr
             ),
@@ -3592,12 +3660,15 @@ class CaseElse(Namespaced, SelectContext, BaseModel):
         return get_concept_arguments(self.expr)
 
     def with_select_context(
-        self, grain: Grain, conditional: Conditional | Comparison | Parenthetical | None
+        self,
+        grain: Grain,
+        conditional: Conditional | Comparison | Parenthetical | None,
+        environment: Environment | None = None,
     ) -> CaseElse:
         return CaseElse(
             discriminant=self.discriminant,
             expr=(
-                self.expr.with_select_context(grain, conditional)
+                self.expr.with_select_context(grain, conditional, environment)
                 if isinstance(
                     self.expr,
                     SelectContext,
@@ -3737,16 +3808,19 @@ class Conditional(
         )
 
     def with_select_context(
-        self, grain: Grain, conditional: Conditional | Comparison | Parenthetical | None
+        self,
+        grain: Grain,
+        conditional: Conditional | Comparison | Parenthetical | None,
+        environment: Environment | None = None,
     ):
         return Conditional(
             left=(
-                self.left.with_select_context(grain, conditional)
+                self.left.with_select_context(grain, conditional, environment)
                 if isinstance(self.left, SelectContext)
                 else self.left
             ),
             right=(
-                self.right.with_select_context(grain, conditional)
+                self.right.with_select_context(grain, conditional, environment)
                 if isinstance(self.right, SelectContext)
                 else self.right
             ),
@@ -3855,13 +3929,16 @@ class AggregateWrapper(Mergeable, Namespaced, SelectContext, BaseModel):
         )
 
     def with_select_context(
-        self, grain: Grain, conditional: Conditional | Comparison | Parenthetical | None
+        self,
+        grain: Grain,
+        conditional: Conditional | Comparison | Parenthetical | None,
+        environment: Environment | None = None,
     ) -> AggregateWrapper:
         if not self.by:
             by = grain.components_copy
         else:
             by = self.by
-        parent = self.function.with_select_context(grain, conditional)
+        parent = self.function.with_select_context(grain, conditional, environment)
         return AggregateWrapper(function=parent, by=by)
 
 
@@ -3893,10 +3970,15 @@ class WhereClause(Mergeable, ConceptArgs, Namespaced, SelectContext, BaseModel):
         return WhereClause(conditional=self.conditional.with_namespace(namespace))
 
     def with_select_context(
-        self, grain: Grain, conditional: Conditional | Comparison | Parenthetical | None
+        self,
+        grain: Grain,
+        conditional: Conditional | Comparison | Parenthetical | None,
+        environment: Environment | None = None,
     ) -> WhereClause:
         return WhereClause(
-            conditional=self.conditional.with_select_context(grain, conditional)
+            conditional=self.conditional.with_select_context(
+                grain, conditional, environment
+            )
         )
 
     @property
@@ -3909,6 +3991,22 @@ class WhereClause(Mergeable, ConceptArgs, Namespaced, SelectContext, BaseModel):
                 output += item.grain.components if item.grain else []
         return Grain(components=list(set(output)))
 
+    @property
+    def components(self):
+        from trilogy.core.processing.utility import decompose_condition
+
+        return decompose_condition(self.conditional)
+
+    @property
+    def is_scalar(self):
+        from trilogy.core.processing.utility import is_scalar_condition
+
+        return is_scalar_condition(self.conditional)
+
+
+class HavingClause(WhereClause):
+    pass
+
 
 class MaterializedDataset(BaseModel):
     address: Address
@@ -3928,6 +4026,7 @@ class ProcessedQuery(BaseModel):
     hidden_columns: List[Concept] = Field(default_factory=list)
     limit: Optional[int] = None
     where_clause: Optional[WhereClause] = None
+    having_clause: Optional[HavingClause] = None
     order_by: Optional[OrderBy] = None
 
 
@@ -4130,11 +4229,14 @@ class Parenthetical(
         )
 
     def with_select_context(
-        self, grain: Grain, conditional: Conditional | Comparison | Parenthetical | None
+        self,
+        grain: Grain,
+        conditional: Conditional | Comparison | Parenthetical | None,
+        environment: Environment | None = None,
     ):
         return Parenthetical(
             content=(
-                self.content.with_select_context(grain, conditional)
+                self.content.with_select_context(grain, conditional, environment)
                 if isinstance(self.content, SelectContext)
                 else self.content
             )