pytrilogy 0.0.2.41__tar.gz → 0.0.2.42__tar.gz

{pytrilogy-0.0.2.41/pytrilogy.egg-info → pytrilogy-0.0.2.42}/PKG-INFO

@@ -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 → pytrilogy-0.0.2.42/pytrilogy.egg-info}/PKG-INFO

@@ -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 → pytrilogy-0.0.2.42}/tests/test_functions.py

@@ -89,6 +89,16 @@ def test_window_functions(test_environment):
         dialect.compile_statement(process_query(test_environment, select))
 
 
+def test_window_datatype(test_environment):
+    declarations = """
+
+    auto category_rank <- rank category_name order by count(order_id) desc;
+
+        """
+    env, parsed = parse(declarations, environment=test_environment)
+    assert env.concepts["category_rank"].datatype == DataType.INTEGER
+
+
 def test_date_functions(test_environment):
     declarations = """
 

{pytrilogy-0.0.2.41 → pytrilogy-0.0.2.42}/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"]

{pytrilogy-0.0.2.41 → pytrilogy-0.0.2.42}/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 = [

{pytrilogy-0.0.2.41 → pytrilogy-0.0.2.42}/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,