pytrilogy 0.0.3.120__tar.gz → 0.0.3.121__tar.gz

{pytrilogy-0.0.3.120/pytrilogy.egg-info → pytrilogy-0.0.3.121}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.120
+Version: 0.0.3.121
 Summary: Declarative, typed query language that compiles to SQL.
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pytrilogy-0.0.3.120 → pytrilogy-0.0.3.121/pytrilogy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.120
+Version: 0.0.3.121
 Summary: Declarative, typed query language that compiles to SQL.
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pytrilogy-0.0.3.120 → pytrilogy-0.0.3.121}/tests/test_user_functions.py

@@ -312,3 +312,38 @@ auto random <- @plus_two(@weekday_sales(10));
     results = results.fetchall()
     assert results[0].test2 == 10
     assert results[1].test2 == 17
+
+
+def test_user_function_aggregate_two():
+    x = Dialects.DUCK_DB.default_executor()
+
+    results = x.execute_query(
+        """import std.geography;
+import std.display;
+
+key state string::us_state;
+key year int;
+property state.val string;
+
+datasource states
+(
+    state,
+    year,
+    val
+)
+grain (state, year)
+query '''
+select 'Vermont' as state, 2000 as year, 10 as val union all select 'Florida' as state, 2000, 5 as val
+union all select 'Vermont', 2001, 16 union all select 'Florida' as state, 2001, 7
+'''
+;
+
+def avg_year_percent_of_all_avg_year(field, dim)->round((avg(sum(field) by year, dim)/ avg(sum(field) by year )),2)::float::percent;
+
+select @avg_year_percent_of_all_avg_year(val, state) as p_of_whole, state
+order by p_of_whole desc;
+"""
+    )
+
+    results = results.fetchall()
+    assert int(results[0].p_of_whole * 100) == 68

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

{pytrilogy-0.0.3.120 → pytrilogy-0.0.3.121}/trilogy/core/models/author.py

@@ -162,14 +162,13 @@ class ConceptRef(Addressable, Namespaced, DataTyped, Mergeable, BaseModel):
         )
 
     def with_reference_replacement(self, source: str, target: Expr | ArgBinding):
-        if self.address == source:
-            return target
-
         # a reference might be to an attribute of a struct that is bound late
         # if the replacement is a parent in the access path; replace reference
         # with an attribute access call
-        candidates = [f"local.{self.address}", self.address]
+        candidates = [f"{DEFAULT_NAMESPACE}.{self.address}", self.address]
         for candidate in candidates:
+            if candidate == source:
+                return target
             if not candidate.startswith(f"{source}."):
                 continue
             attribute = self.address.rsplit(".", 1)[1]
@@ -2535,11 +2534,7 @@ class CustomFunctionFactory:
                     target = f"{DEFAULT_NAMESPACE}.{self.function_arguments[idx].name}"
                 else:
                     target = self.function_arguments[idx].name
-                nout = (
-                    nout.with_reference_replacement(target, x)
-                    if isinstance(nout, Mergeable)
-                    else nout
-                )
+                nout = nout.with_reference_replacement(target, x)
         return nout
 
 

{pytrilogy-0.0.3.120 → pytrilogy-0.0.3.121}/trilogy/dialect/duckdb.py

@@ -104,6 +104,7 @@ FUNCTION_MAP = {
     FunctionType.CONCAT: lambda x: f"({' || '.join(x)})",
     FunctionType.DATE_LITERAL: lambda x: f"date '{x}'",
     FunctionType.DATETIME_LITERAL: lambda x: f"datetime '{x}'",
+    FunctionType.DAY_OF_WEEK: lambda x: f"dayofweek({x[0]})",
     # string
     FunctionType.CONTAINS: lambda x: f"CONTAINS(LOWER({x[0]}), LOWER({x[1]}))",
     # regexp

{pytrilogy-0.0.3.120 → pytrilogy-0.0.3.121}/trilogy/parsing/parse_engine.py

@@ -1516,6 +1516,7 @@ class ParseToObjects(Transformer):
         remapped = FunctionCallWrapper(
             content=self.environment.functions[name](*args), name=name, args=args
         )
+
         return remapped
 
     @v_args(meta=True)