pytrilogy 0.0.3.92__tar.gz → 0.0.3.93__tar.gz

{pytrilogy-0.0.3.92/pytrilogy.egg-info → pytrilogy-0.0.3.93}/PKG-INFO

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

{pytrilogy-0.0.3.92 → pytrilogy-0.0.3.93/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.92 → pytrilogy-0.0.3.93}/pytrilogy.egg-info/SOURCES.txt

@@ -90,6 +90,7 @@ trilogy/core/processing/node_generators/node_merge_node.py
 trilogy/core/processing/node_generators/recursive_node.py
 trilogy/core/processing/node_generators/rowset_node.py
 trilogy/core/processing/node_generators/select_merge_node.py
+trilogy/core/processing/node_generators/select_merge_node_v2.py
 trilogy/core/processing/node_generators/select_node.py
 trilogy/core/processing/node_generators/synonym_node.py
 trilogy/core/processing/node_generators/union_node.py

{pytrilogy-0.0.3.92 → pytrilogy-0.0.3.93}/tests/test_discovery_nodes.py

@@ -67,7 +67,7 @@ def test_group_node_property_all(test_environment: Environment, test_environment
     sum_name_length = test_environment.concepts["category_name_length_sum"]
     all_rows = test_environment.concepts[f"{INTERNAL_NAMESPACE}.{ALL_ROWS_CONCEPT}"]
     sum_name_length_all_rows = sum_name_length.with_grain(
-        BuildGrain(components=[all_rows])
+        BuildGrain(components={all_rows.address})
     )
     group_node = gen_group_node(
         sum_name_length_all_rows,

{pytrilogy-0.0.3.92 → pytrilogy-0.0.3.93}/tests/test_parsing.py

@@ -5,7 +5,6 @@ from trilogy.core.functions import argument_to_purpose, function_args_to_output_
 from trilogy.core.models.author import (
     Comparison,
     Conditional,
-    ListWrapper,
     SubselectComparison,
 )
 from trilogy.core.models.build import BuildComparison
@@ -61,7 +60,7 @@ def test_not_in():
     _, parsed = parse_text(
         "const order_id <- 4; SELECT order_id  WHERE order_id NOT IN (1,2,3);"
     )
-    query: ProcessedQuery = parsed[-1]
+    query: SelectStatement = parsed[-1]
     right = query.where_clause.conditional.right
     assert isinstance(right, TupleWrapper), type(right)
     assert right[0] == 1
@@ -75,7 +74,7 @@ def test_datetime_lit_rendering():
     from datetime import datetime
 
     now = datetime.now()
-    wrapper = ListWrapper(
+    wrapper = TupleWrapper(
         (now,),
         type=DataType.DATETIME,
     )

{pytrilogy-0.0.3.92 → pytrilogy-0.0.3.93}/tests/test_query_processing.py

@@ -135,7 +135,7 @@ def test_basic_aggregate(test_environment: Environment, test_environment_graph):
     )
     datasource = datasource.resolve()
     assert isinstance(datasource, QueryDatasource)
-    assert datasource.grain == BuildGrain(components=[product])
+    assert datasource.grain == BuildGrain(components={product.address})
 
 
 def test_join_aggregate(test_environment: Environment, test_environment_graph):

{pytrilogy-0.0.3.92 → pytrilogy-0.0.3.93}/trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.dialect.enums import Dialects
 from trilogy.executor import Executor
 from trilogy.parser import parse
 
-__version__ = "0.0.3.92"
+__version__ = "0.0.3.93"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.92 → pytrilogy-0.0.3.93}/trilogy/core/models/author.py

@@ -1133,7 +1133,7 @@ class Concept(Addressable, DataTyped, ConceptArgs, Mergeable, Namespaced, BaseMo
             granularity=self.granularity,
             derivation=self.derivation,
             lineage=self.lineage,
-            grain=grain if grain else Grain(components=set()),
+            grain=grain if grain else Grain.model_construct(components=set()),
             namespace=self.namespace,
             keys=self.keys,
             modifiers=self.modifiers,