pytrilogy 0.0.2.25__tar.gz → 0.0.2.27__tar.gz

{pytrilogy-0.0.2.25/pytrilogy.egg-info → pytrilogy-0.0.2.27}/PKG-INFO

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

{pytrilogy-0.0.2.25 → pytrilogy-0.0.2.27/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.2.25 → pytrilogy-0.0.2.27}/tests/test_models.py

@@ -11,7 +11,7 @@ from trilogy.core.models import (
     BaseJoin,
     Comparison,
     Join,
-    JoinKey,
+    CTEConceptPair,
     Concept,
     AggregateWrapper,
     RowsetItem,
@@ -190,31 +190,13 @@ def test_base_join(test_environment: Environment):
         right_datasource=test_environment.datasources["products"],
         concepts=[
             test_environment.concepts["product_id"],
-            test_environment.concepts["category_name"],
+            # test_environment.concepts["category_name"],
         ],
         join_type=JoinType.RIGHT_OUTER,
-        filter_to_mutual=True,
     )
 
     assert x.concepts == [test_environment.concepts["product_id"]]
 
-    exc3: SyntaxError | None = None
-    try:
-        x = BaseJoin(
-            left_datasource=test_environment.datasources["revenue"],
-            right_datasource=test_environment.datasources["category"],
-            concepts=[
-                test_environment.concepts["product_id"],
-                test_environment.concepts["category_name"],
-            ],
-            join_type=JoinType.RIGHT_OUTER,
-            filter_to_mutual=True,
-        )
-    except Exception as exc4:
-        exc3 = exc4
-        pass
-    assert isinstance(exc3, SyntaxError)
-
 
 def test_comparison():
     try:
@@ -264,13 +246,16 @@ def test_join(test_environment: Environment):
     test = Join(
         left_cte=a,
         right_cte=b,
-        joinkeys=[JoinKey(concept=x) for x in outputs],
+        joinkey_pairs=[
+            CTEConceptPair(left=x, right=x, existing_datasource=a.source, cte=a)
+            for x in outputs
+        ],
         jointype=JoinType.RIGHT_OUTER,
     )
 
     assert (
         str(test)
-        == "right outer JOIN test and testb on local.product_id<local.product_id>,local.category_id<local.category_id>"
+        == "right outer join testb on test.local.product_id=local.product_id,test.local.category_id=local.category_id"
     ), str(test)
 
 

{pytrilogy-0.0.2.25 → pytrilogy-0.0.2.27}/tests/test_parsing.py

@@ -491,6 +491,28 @@ select x;
     assert "abcdef as test" in results, results
 
 
+def test_datasource_where_equivalent():
+
+    text = """
+key x int;
+key y int;
+
+datasource test (
+x:x,
+y:~y)
+grain(x)
+complete where y > 10
+address `abc:def`
+;
+
+
+"""
+    env, parsed = parse_text(text)
+
+    ds = parsed[-1]
+    assert ds.non_partial_for.conditional.right == 10
+
+
 def test_filter_concise():
 
     text = """

{pytrilogy-0.0.2.25 → pytrilogy-0.0.2.27}/tests/test_partial_handling.py

@@ -74,7 +74,7 @@ def setup_titanic(env: Environment):
 
     env.add_datasource(
         Datasource(
-            identifier="raw_data",
+            name="raw_data",
             address="raw_titanic",
             columns=[
                 ColumnAssignment(alias="passengerid", concept=id),

{pytrilogy-0.0.2.25 → pytrilogy-0.0.2.27}/tests/test_query_processing.py

@@ -134,7 +134,7 @@ def test_query_aggregation(test_environment, test_environment_graph):
         environment=test_environment, graph=test_environment_graph, statement=select
     )
 
-    assert {datasource.identifier} == {"local_revenue_at_local_order_id_at_abstract"}
+    assert {datasource.identifier} == {"revenue_at_local_order_id_at_abstract"}
     check = datasource
     assert len(check.input_concepts) == 2
     assert check.input_concepts[0].name == "revenue"

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

{pytrilogy-0.0.2.25 → pytrilogy-0.0.2.27}/trilogy/constants.py

@@ -7,7 +7,7 @@ logger = getLogger("trilogy")
 
 DEFAULT_NAMESPACE = "local"
 
-VIRTUAL_CONCEPT_PREFIX = "_virtual"
+VIRTUAL_CONCEPT_PREFIX = "_virt"
 
 ENV_CACHE_NAME = ".preql_cache.json"
 

{pytrilogy-0.0.2.25 → pytrilogy-0.0.2.27}/trilogy/core/graph_models.py

@@ -6,7 +6,7 @@ from trilogy.core.models import Concept, Datasource
 def concept_to_node(input: Concept) -> str:
     # if input.purpose == Purpose.METRIC:
     #     return f"c~{input.namespace}.{input.name}@{input.grain}"
-    return f"c~{input.namespace}.{input.name}@{input.grain}"
+    return f"c~{input.address}@{input.grain}"
 
 
 def datasource_to_node(input: Datasource) -> str:
@@ -14,7 +14,7 @@ def datasource_to_node(input: Datasource) -> str:
     #     return "ds~join~" + ",".join(
     #         [datasource_to_node(sub) for sub in input.datasources]
     #     )
-    return f"ds~{input.namespace}.{input.identifier}"
+    return f"ds~{input.identifier}"
 
 
 class ReferenceGraph(nx.DiGraph):