ransacklib 1.1.0.dev15__tar.gz → 2.0.0a2__tar.gz

{ransacklib-1.1.0.dev15/ransacklib.egg-info → ransacklib-2.0.0a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ransacklib
-Version: 1.1.0.dev15
+Version: 2.0.0a2
 Summary: A modern, extensible language for manipulation with structured data
 Author-email: "Rajmund H. Hruška" <rajmund.hruska@cesnet.cz>
 License-Expression: MIT

{ransacklib-1.1.0.dev15 → ransacklib-2.0.0a2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ransacklib"
-version = "1.1.0.dev15"
+version = "2.0.0.a2"
 description = "A modern, extensible language for manipulation with structured data"
 license = "MIT"
 readme = "README.rst"

{ransacklib-1.1.0.dev15 → ransacklib-2.0.0a2}/ransack/operator.py

@@ -807,6 +807,18 @@ def _operator_map_sql(op, l_sql, r_sql, t1, t2) -> tuple[str, typing.Any, bool]:
     def find_comp(operator, d, lhs_type, rhs_type):
         for (lhs_expected, rhs_expected), value in d[operator].items():
             if _matches(lhs_type, lhs_expected) and _matches(rhs_type, rhs_expected):
+                if (
+                    (
+                        isinstance(lhs_expected, (List, Range))
+                        and isinstance(rhs_expected, (List, Range))
+                    )
+                    and lhs_expected.element_type is Any
+                    and rhs_expected.element_type is Any
+                    and lhs_type.element_type is not Empty
+                    and rhs_type.element_type is not Empty
+                    and lhs_type.element_type != rhs_type.element_type
+                ):
+                    continue
                 return value
         raise KeyError
 

{ransacklib-1.1.0.dev15 → ransacklib-2.0.0a2/ransacklib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ransacklib
-Version: 1.1.0.dev15
+Version: 2.0.0a2
 Summary: A modern, extensible language for manipulation with structured data
 Author-email: "Rajmund H. Hruška" <rajmund.hruska@cesnet.cz>
 License-Expression: MIT

{ransacklib-1.1.0.dev15 → ransacklib-2.0.0a2}/tests/test_postgres.py

@@ -1292,6 +1292,8 @@ def test_complex_expressions(
         '"abc"..123',
         "01:00:00..5",
         "not_there",  # Unknown column.
+        "[1, 2, 3] . ['a', 'b', 'c']",  # Operator not found for given types.
+        "['example.com'] in [192.168.0.0/16]",
     ],
 )
 def test_invalid_cases(expr):

{ransacklib-1.1.0.dev15 → ransacklib-2.0.0a2}/tests/test_transformer.py

@@ -6,13 +6,7 @@ from lark import Token
 
 from ransack.exceptions import RansackError, ShapeError
 from ransack.parser import Parser
-from ransack.transformer import (
-    ExpressionTransformer,
-    Filter,
-    SQLInterpreter,
-    TokenWrapper,
-    get_values,
-)
+from ransack.transformer import ExpressionTransformer, Filter, TokenWrapper, get_values
 
 
 @pytest.fixture
@@ -30,11 +24,6 @@ def expr_transformer():
     return ExpressionTransformer()
 
 
-@pytest.fixture
-def sql():
-    return SQLInterpreter()
-
-
 sample_data = {
     "Category": ["Intrusion.UserCompromise"],
     "ConnCount": 1,