pytrilogy 0.0.3.85__tar.gz → 0.0.3.86__tar.gz

{pytrilogy-0.0.3.85/pytrilogy.egg-info → pytrilogy-0.0.3.86}/PKG-INFO

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

{pytrilogy-0.0.3.85 → pytrilogy-0.0.3.86/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.85 → pytrilogy-0.0.3.86}/tests/test_datatypes.py

@@ -30,7 +30,7 @@ def test_cast_error():
     """
         )
     except InvalidSyntaxException as e:
-        assert "Cannot compare DataType.INTEGER and DataType.STRING" in str(e)
+        assert "Cannot compare INTEGER (ref:local.x) and STRING (ref:local.y)" in str(e)
         found = True
     if not found:
         assert False, "Expected InvalidSyntaxException not raised"

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

{pytrilogy-0.0.3.85 → pytrilogy-0.0.3.86}/trilogy/core/models/author.py

@@ -637,33 +637,31 @@ class Comparison(ConceptArgs, Mergeable, DataTyped, Namespaced, BaseModel):
 
     @model_validator(mode="after")
     def validate_comparison(self):
+        left_type = arg_to_datatype(self.left)
+        right_type = arg_to_datatype(self.right)
         if self.operator in (ComparisonOperator.IS, ComparisonOperator.IS_NOT):
-            if self.right != MagicConstants.NULL and DataType.BOOL != arg_to_datatype(
-                self.right
-            ):
+            if self.right != MagicConstants.NULL and DataType.BOOL != right_type:
                 raise SyntaxError(
                     f"Cannot use {self.operator.value} with non-null or boolean value {self.right}"
                 )
         elif self.operator in (ComparisonOperator.IN, ComparisonOperator.NOT_IN):
-            right_type = arg_to_datatype(self.right)
+
             if isinstance(right_type, ArrayType) and not is_compatible_datatype(
-                arg_to_datatype(self.left), right_type.value_data_type
+                left_type, right_type.value_data_type
             ):
                 raise SyntaxError(
-                    f"Cannot compare {arg_to_datatype(self.left)} and {right_type} with operator {self.operator} in {str(self)}"
+                    f"Cannot compare {left_type} and {right_type} with operator {self.operator} in {str(self)}"
                 )
             elif isinstance(self.right, Concept) and not is_compatible_datatype(
-                arg_to_datatype(self.left), arg_to_datatype(self.right)
+                left_type, right_type
             ):
                 raise SyntaxError(
-                    f"Cannot compare {arg_to_datatype(self.left)} and {arg_to_datatype(self.right)} with operator {self.operator} in {str(self)}"
+                    f"Cannot compare {left_type.name} and {right_type.name} with operator {self.operator} in {str(self)}"
                 )
         else:
-            if not is_compatible_datatype(
-                arg_to_datatype(self.left), arg_to_datatype(self.right)
-            ):
+            if not is_compatible_datatype(left_type, right_type):
                 raise SyntaxError(
-                    f"Cannot compare {arg_to_datatype(self.left)} and {arg_to_datatype(self.right)} of different types with operator {self.operator} in {str(self)}"
+                    f"Cannot compare {left_type.name} ({self.left}) and {right_type.name} ({self.right}) of different types with operator {self.operator.value} in {str(self)}"
                 )
 
         return self

{pytrilogy-0.0.3.85 → pytrilogy-0.0.3.86}/trilogy/dialect/duckdb.py

@@ -76,6 +76,7 @@ FUNCTION_MAP = {
     FunctionType.DATE: lambda x: f"cast({x[0]} as date)",
     FunctionType.DATE_TRUNCATE: lambda x: f"date_trunc('{x[1]}', {x[0]})",
     FunctionType.DATE_ADD: lambda x: f"date_add({x[0]}, {x[2]} * INTERVAL 1 {x[1]})",
+    FunctionType.DATE_SUB: lambda x: f"date_add({x[0]}, -{x[2]} * INTERVAL 1 {x[1]})",
     FunctionType.DATE_PART: lambda x: f"date_part('{x[1]}', {x[0]})",
     FunctionType.DATE_DIFF: lambda x: f"date_diff('{x[2]}', {x[0]}, {x[1]})",
     FunctionType.CONCAT: lambda x: f"({' || '.join(x)})",

{pytrilogy-0.0.3.85 → pytrilogy-0.0.3.86}/trilogy/parsing/parse_engine.py

@@ -683,7 +683,9 @@ class ParseToObjects(Transformer):
             )
             # let constant purposes exist to support round-tripping
             # as a build concept may end up with a constant based on constant inlining happening recursively
-            if (
+            if purpose == Purpose.KEY and concept.purpose != Purpose.KEY:
+                concept.purpose = Purpose.KEY
+            elif (
                 purpose
                 and purpose != Purpose.AUTO
                 and concept.purpose != purpose

{pytrilogy-0.0.3.85 → pytrilogy-0.0.3.86}/trilogy/parsing/trilogy.lark

@@ -367,7 +367,7 @@
     fyear: _YEAR expr ")"
     
     DATE_PART: "DAY"i | "WEEK"i | "MONTH"i | "QUARTER"i | "YEAR"i | "MINUTE"i | "HOUR"i | "SECOND"i | "DAY_OF_WEEK"i
-    _DATE_TRUNC.1: "date_trunc("i
+    _DATE_TRUNC.1: "date_trunc("i | "date_truncate("i
     fdate_trunc: _DATE_TRUNC expr "," DATE_PART ")"
     _DATE_PART.1: "date_part("i
     fdate_part: _DATE_PART expr "," DATE_PART ")"