ransacklib 1.1.0.dev8__tar.gz → 1.1.0.dev10__tar.gz

{ransacklib-1.1.0.dev8/ransacklib.egg-info → ransacklib-1.1.0.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ransacklib
-Version: 1.1.0.dev8
+Version: 1.1.0.dev10
 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.dev8 → ransacklib-1.1.0.dev10}/pyproject.toml

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

{ransacklib-1.1.0.dev8 → ransacklib-1.1.0.dev10}/ransack/operator.py

@@ -608,7 +608,7 @@ def _operator_map_sql(op, l_sql, r_sql, t1, t2) -> tuple[str, Any, bool]:
             (Number, Number): (f"{l_sql} / {r_sql}", Number),
         },
         "%": {
-            (Number, Number): (f"({l_sql} % {r_sql})", Number),
+            (Number, Number): (f"({l_sql} %% {r_sql})", Number),
         },
         ".": {
             (str, str): (f"{l_sql} || {r_sql}", str),
@@ -680,4 +680,4 @@ def binary_operation_sql(
             return sql, type_, not switch
         except KeyError:
             pass
-    raise OperatorNotFoundError(operator, (l_type, r_type), (left, right)) from None
+    raise OperatorNotFoundError(operator, (l_type, r_type)) from None

{ransacklib-1.1.0.dev8 → ransacklib-1.1.0.dev10}/ransack/transformer.py

@@ -830,7 +830,9 @@ class SQLInterpreter(Interpreter):
     A class providing a method for translating the query from 'ransack' language to SQL.
     """
 
-    def to_sql(self, tree: Tree, data: dict | None = None) -> tuple[str, list[Any]]:
+    def to_sql(
+        self, tree: Tree, data: dict | None = None
+    ) -> tuple[str, list[Any], Any]:
         """
         Translates the given tree to PostgreSQL query using the provided data.
 
@@ -839,15 +841,15 @@ class SQLInterpreter(Interpreter):
             data: Optional dictionary containing the definition of queried columns.
 
         Returns:
-            A part of the SQL query (the part after 'SELECT' or 'WHERE') and its
-            parameters.
+            A part of the SQL query (the part after 'SELECT' or 'WHERE'), its
+            parameters and a resulting type.
         """
         self.data = data if data is not None else {}
 
-        result, params, _ = self.visit(tree)
+        result, params, type_ = self.visit(tree)
 
         self.data = {}
-        return result, params
+        return result, params, type_
 
     def number(self, token: TokenWrapper) -> tuple[str, list, type[int | float]]:
         return ("%s", [token.real_value], type(token.real_value))

{ransacklib-1.1.0.dev8 → ransacklib-1.1.0.dev10/ransacklib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ransacklib
-Version: 1.1.0.dev8
+Version: 1.1.0.dev10
 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.dev8 → ransacklib-1.1.0.dev10}/tests/test_transformer.py

@@ -725,7 +725,7 @@ class TestSQLInterpreter:
             # Test arithmetic operations.
             (
                 "(10 + 12 - 7) * (15 / (8 % 3)) - (-5)",
-                "(((%s + %s) - %s) * %s / (%s % %s) - (-%s))",
+                "(((%s + %s) - %s) * %s / (%s %% %s) - (-%s))",
                 [10, 12, 7, 15, 8, 3, 5],
             ),
             # Test comparisons.
@@ -856,7 +856,7 @@ class TestSQLInterpreter:
         ],
     )
     def test_parse_sql(self, parser, sql, expr, expected_sql, expected_params):
-        sql_str, params = self.parse(parser, sql, expr)
+        sql_str, params, _ = self.parse(parser, sql, expr)
 
         assert sql_str == expected_sql
         assert params == expected_params