pytrilogy 0.0.2.41__py3-none-any.whl → 0.0.2.42__py3-none-any.whl

{pytrilogy-0.0.2.41.dist-info → pytrilogy-0.0.2.42.dist-info}/METADATA

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

{pytrilogy-0.0.2.41.dist-info → pytrilogy-0.0.2.42.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trilogy/__init__.py,sha256=TkwxYmJ568eljR1wX8-wzP48QWvm0V6gSnZBN5DX-jk,291
+trilogy/__init__.py,sha256=glHFECV4KATmV-8gTFg956amPYtuISIt3uvusd_0zl8,291
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=UPymm94T2c6a55XdDaXw0aleTe1pOJ6lf6gOWLKZyKg,1430
 trilogy/engine.py,sha256=R5ubIxYyrxRExz07aZCUfrTsoXCHQ8DKFTDsobXdWdA,1102
@@ -40,7 +40,7 @@ trilogy/core/processing/node_generators/rowset_node.py,sha256=KtdN6t2xM8CJxobc4a
 trilogy/core/processing/node_generators/select_merge_node.py,sha256=UF4xra2sJ6dGg9TLJUgqtTX-UxqUaCEfAGo-uq7HlVs,12139
 trilogy/core/processing/node_generators/select_node.py,sha256=nwXHQF6C-aQUIelx9dyxN2pK3muL-4-6RIqnqQqNwtw,1808
 trilogy/core/processing/node_generators/unnest_node.py,sha256=cZ26CN338CBnd6asML1OBUtNcDzmNlFpY0Vnade4yrc,2256
-trilogy/core/processing/node_generators/window_node.py,sha256=Jfjjdvn8RqFzrQ1gZc6vS0Bsh_iTA5AmRZ0zLlT4574,3155
+trilogy/core/processing/node_generators/window_node.py,sha256=Ywb2K0T5Ym_Y4XStzIE2fuWV1fW2dp5eQ2hXVFTLsGM,3511
 trilogy/core/processing/nodes/__init__.py,sha256=qS5EJDRwwIrCEfS7ibCA2ESE0RPzsAIii1UWd_wNsHA,4760
 trilogy/core/processing/nodes/base_node.py,sha256=sc3HrXkWk-xpsAQ7B7ltX1ZejYAkqFiv8Ei8Jg5VGkQ,15579
 trilogy/core/processing/nodes/filter_node.py,sha256=GfZ9eghpFDI-s7iQP2UqTljCmn25LT_T5TAxDlh7PkQ,2343
@@ -66,7 +66,7 @@ trilogy/hooks/graph_hook.py,sha256=onHvMQPwj_KOS3HOTpRFiy7QLLKAiycq2MzJ_Q0Oh5Y,2
 trilogy/hooks/query_debugger.py,sha256=787umJjdGA057DCC714dqFstzJRUbwmz3MNr66IdpQI,4404
 trilogy/metadata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/parsing/common.py,sha256=_GW9LU6_4RuUgcdcr8EE1ybCRd-7cz3idZtjHZ66pYA,10182
+trilogy/parsing/common.py,sha256=3kly4cH36F_8nwR1evKB5_yk1ezEtwwoeav4PrHUJ6o,10417
 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
@@ -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.41.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.41.dist-info/METADATA,sha256=PGYuvWWThHh9Vucj7-eZIWLGu7db7pN7iVyXL9f42-Q,8426
-pytrilogy-0.0.2.41.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pytrilogy-0.0.2.41.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.41.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.41.dist-info/RECORD,,
+pytrilogy-0.0.2.42.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.2.42.dist-info/METADATA,sha256=DIvk05ia-Z1WZ3x27s6T8KbPpw-qsTeKjJEFyZ-f06s,8426
+pytrilogy-0.0.2.42.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pytrilogy-0.0.2.42.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.2.42.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.2.42.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.41"
+__version__ = "0.0.2.42"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/processing/node_generators/window_node.py

@@ -10,7 +10,9 @@ from trilogy.core.processing.utility import padding
 LOGGER_PREFIX = "[GEN_WINDOW_NODE]"
 
 
-def resolve_window_parent_concepts(concept: Concept) -> tuple[Concept, List[Concept]]:
+def resolve_window_parent_concepts(
+    concept: Concept, environment: Environment
+) -> tuple[Concept, List[Concept]]:
     if not isinstance(concept.lineage, WindowItem):
         raise ValueError
     base = []
@@ -18,6 +20,11 @@ def resolve_window_parent_concepts(concept: Concept) -> tuple[Concept, List[Conc
         base += concept.lineage.over
     if concept.lineage.order_by:
         for item in concept.lineage.order_by:
+            # TODO: we do want to use the rehydrated value, but
+            # that introduces a circular dependency on an aggregate
+            # that is grouped by a window
+            # need to figure out how to resolve this
+            # base += [environment.concepts[item.expr.output.address]]
             base += [item.expr.output]
     return concept.lineage.content, unique(base, "address")
 
@@ -32,12 +39,12 @@ def gen_window_node(
     history: History | None = None,
     conditions: WhereClause | None = None,
 ) -> StrategyNode | None:
-    base, parent_concepts = resolve_window_parent_concepts(concept)
+    base, parent_concepts = resolve_window_parent_concepts(concept, environment)
     equivalent_optional = [
         x
         for x in local_optional
         if isinstance(x.lineage, WindowItem)
-        and resolve_window_parent_concepts(x)[1] == parent_concepts
+        and resolve_window_parent_concepts(x, environment)[1] == parent_concepts
     ]
 
     non_equivalent_optional = [

trilogy/parsing/common.py

@@ -13,6 +13,7 @@ from trilogy.core.models import (
     Parenthetical,
     FunctionClass,
     Environment,
+    DataType,
 )
 from typing import List, Tuple
 from trilogy.core.functions import (
@@ -25,7 +26,7 @@ from trilogy.core.enums import PurposeLineage
 from trilogy.constants import (
     VIRTUAL_CONCEPT_PREFIX,
 )
-from trilogy.core.enums import Modifier
+from trilogy.core.enums import Modifier, WindowType
 
 
 def get_upstream_modifiers(keys: List[Concept]) -> list[Modifier]:
@@ -234,9 +235,18 @@ def window_item_to_concept(
     else:
         grain = parent.over + [parent.content.output]
     modifiers = get_upstream_modifiers(parent.content.concept_arguments)
+    datatype = parent.content.datatype
+    if parent.type in (
+        WindowType.RANK,
+        WindowType.ROW_NUMBER,
+        WindowType.COUNT,
+        WindowType.COUNT_DISTINCT,
+    ):
+        datatype = DataType.INTEGER
+
     return Concept(
         name=name,
-        datatype=parent.content.datatype,
+        datatype=datatype,
         purpose=local_purpose,
         lineage=parent,
         metadata=fmetadata,