pytrilogy 0.0.3.2__tar.gz → 0.0.3.3__tar.gz

{pytrilogy-0.0.3.2/pytrilogy.egg-info → pytrilogy-0.0.3.3}/PKG-INFO

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

{pytrilogy-0.0.3.2 → pytrilogy-0.0.3.3/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.2 → pytrilogy-0.0.3.3}/tests/test_models.py

@@ -1,5 +1,7 @@
 from copy import deepcopy
 
+from pytest import raises
+
 from trilogy import parse
 from trilogy.core.enums import (
     BooleanOperator,
@@ -22,6 +24,7 @@ from trilogy.core.models.author import (
 from trilogy.core.models.build import BuildGrain
 from trilogy.core.models.core import (
     DataType,
+    ListWrapper,
     TupleWrapper,
 )
 from trilogy.core.models.datasource import Address
@@ -206,6 +209,19 @@ def test_base_join(test_environment: Environment):
     assert x.concepts == [test_environment.concepts["product_id"]]
 
 
+def test_comparison():
+    with raises(SyntaxError):
+        Comparison(left=1, right="abc", operator=ComparisonOperator.EQ)
+
+    with raises(SyntaxError):
+        Comparison(left=1, right=1, operator=ComparisonOperator.IN)
+
+    # this should not error
+    Comparison(left=1, right=[1, 2, 3], operator=ComparisonOperator.IN)
+
+    Comparison(left=1, right=ListWrapper([1, 2, 3]), operator=ComparisonOperator.IN)
+
+
 def test_comparison():
     try:
         Comparison(left=1, right="abc", operator=ComparisonOperator.EQ)

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

{pytrilogy-0.0.3.2 → pytrilogy-0.0.3.3}/trilogy/core/models/author.py

@@ -585,19 +585,23 @@ class Comparison(ConceptArgs, Mergeable, Namespaced, BaseModel):
                     f"Cannot use {self.operator.value} with non-null or boolean value {self.right}"
                 )
         elif self.operator in (ComparisonOperator.IN, ComparisonOperator.NOT_IN):
-            right = arg_to_datatype(self.right)
-            if not isinstance(
-                self.right, (ConceptRef, Concept, ListType, TupleWrapper)
+            right_type = arg_to_datatype(self.right)
+            if not any(
+                [
+                    isinstance(self.right, ConceptRef),
+                    right_type in (DataType.LIST,),
+                    isinstance(right_type, (ListType, ListWrapper, TupleWrapper)),
+                ]
             ):
                 raise SyntaxError(
-                    f"Cannot use {self.operator.value} with non-list, non-tuple, non-concept object {right} in {str(self)}"
+                    f"Cannot use {self.operator.value} with non-list, non-tuple, non-concept object {self.right} in {str(self)}"
                 )
 
-            elif isinstance(right, ListType) and not is_compatible_datatype(
-                arg_to_datatype(self.left), right.value_data_type
+            elif isinstance(right_type, ListType) and not is_compatible_datatype(
+                arg_to_datatype(self.left), right_type.value_data_type
             ):
                 raise SyntaxError(
-                    f"Cannot compare {arg_to_datatype(self.left)} and {right} with operator {self.operator} in {str(self)}"
+                    f"Cannot compare {arg_to_datatype(self.left)} 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)