ransacklib 1.1.0.dev2__tar.gz → 1.1.0.dev3__tar.gz

{ransacklib-1.1.0.dev2/ransacklib.egg-info → ransacklib-1.1.0.dev3}/PKG-INFO

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

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

{ransacklib-1.1.0.dev2 → ransacklib-1.1.0.dev3}/ransack/operator.py

@@ -546,10 +546,36 @@ def _operator_map_sql(op, l_sql, r_sql, t1, t2) -> tuple[str, Any]:
         "or": {(bool, bool): f"{l_sql} OR {r_sql}"},
         "contains": {(str, str): f"position({r_sql} in {l_sql})>0"},
     }
+    d2: dict[str, dict] = {
+        "+": {
+            (Number, Number): (f"{l_sql} + {r_sql}", Number),
+            (datetime, timedelta): (f"{l_sql} + {r_sql}", datetime),
+            (timedelta, timedelta): (f"{l_sql} + {r_sql}", timedelta),
+        },
+        "-": {
+            (Number, Number): (f"{l_sql} - {r_sql}", Number),
+            (datetime, timedelta): (f"{l_sql} - {r_sql}", datetime),
+            (timedelta, timedelta): (f"{l_sql} - {r_sql}", timedelta),
+            (datetime, datetime): (f"{l_sql} - {r_sql}", timedelta),
+        },
+        "*": {
+            (timedelta, Number): (f"{l_sql} * {r_sql}", timedelta),
+            (Number, Number): (f"{l_sql} * {r_sql}", Number),
+        },
+        "/": {
+            (timedelta, timedelta): (f"{l_sql} / {r_sql}", timedelta),
+            (Number, Number): (f"{l_sql} / {r_sql}", Number),
+        },
+        "%": {
+            (Number, Number): (f"{l_sql} % {r_sql}", timedelta),
+        },
+    }
     if op == "==":
         return (f"{l_sql} = {r_sql}", bool)
     if op == "in":
         return (d["="][(t1, t2)], bool)
+    if op in d2:
+        return d2[op][(t1, t2)]
     return (d[op][(t1, t2)], bool)
 
 

{ransacklib-1.1.0.dev2 → ransacklib-1.1.0.dev3}/ransack/transformer.py

@@ -924,6 +924,21 @@ class SQLInterpreter(Interpreter):
 
         return binary_operation_sql(operator, l_sql, r_sql, l_type, r_type)
 
+    def add(self, l_tree: Tree, r_tree: Tree) -> tuple[str, Any]:
+        return self._binary_operation("+", l_tree, r_tree)
+
+    def sub(self, l_tree: Tree, r_tree: Tree) -> tuple[str, Any]:
+        return self._binary_operation("-", l_tree, r_tree)
+
+    def mul(self, l_tree: Tree, r_tree: Tree) -> tuple[str, Any]:
+        return self._binary_operation("*", l_tree, r_tree)
+
+    def div(self, l_tree: Tree, r_tree: Tree) -> tuple[str, Any]:
+        return self._binary_operation("/", l_tree, r_tree)
+
+    def mod(self, l_tree: Tree, r_tree: Tree) -> tuple[str, Any]:
+        return self._binary_operation("-", l_tree, r_tree)
+
     def eq(self, l_tree: Tree, r_tree: Tree) -> tuple[str, type[bool]]:
         return self._binary_operation("==", l_tree, r_tree)
 
@@ -966,3 +981,18 @@ class SQLInterpreter(Interpreter):
         var, _ = self.var_from_data(TokenWrapper(path, path))
         sql, type_ = self.visit(default)
         return f"COALESCE({var!s}, {sql})", type_
+
+    def function_(self, name: TokenWrapper, args: Tree | None) -> tuple[str, Any]:
+        function_name = cast("str", name.real_value)
+        args = [self.visit(x) for x in (args.children if args else [])]  # type: ignore
+        if function_name == "now":
+            return "localtimestamp", datetime
+        raise EvaluationError(
+            f"Function '{name.real_value}' was not found.",
+            line=name.line,
+            column=name.column,
+            start_pos=name.start_pos,
+            end_line=name.end_line,
+            end_column=name.end_column,
+            end_pos=name.end_pos,
+        )

{ransacklib-1.1.0.dev2 → ransacklib-1.1.0.dev3/ransacklib.egg-info}/PKG-INFO

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