ransacklib 1.1.0.dev10__tar.gz → 1.1.0.dev11__tar.gz

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

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

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

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

@@ -578,9 +578,21 @@ def _operator_map_sql(op, l_sql, r_sql, t1, t2) -> tuple[str, Any, bool]:
         "and": {(bool, bool): (f"{l_sql} AND {r_sql}", False)},
         "or": {(bool, bool): (f"({l_sql} OR {r_sql})", False)},
         "contains": {
-            (str, str): (f"{l_sql} like '%' || {r_sql} || '%'", False),
+            (str, str): (
+                (
+                    f"{l_sql} like '%%' || "
+                    f"REPLACE(REPLACE(REPLACE({r_sql}, '\\', '\\\\'),"
+                    f" '%%', '\\%%'), '_', '\\_')"
+                    f" || '%%' ESCAPE '\\'"
+                ),
+                False,
+            ),
             (list, str): (
-                f"array_to_string({l_sql}, ',') like '%' || {r_sql} || '%'",
+                (
+                    f"EXISTS (SELECT 1 FROM unnest({l_sql}) AS element "
+                    f"WHERE element LIKE '%%' || REPLACE(REPLACE(REPLACE({r_sql}, "
+                    f"'\\', '\\\\'), '%%', '\\%%'), '_', '\\_') || '%%' ESCAPE '\\')"
+                ),
                 False,
             ),
         },

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

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

@@ -738,15 +738,30 @@ class TestSQLInterpreter:
             ("a_int??", '"a" IS NOT NULL', []),
             ("a_int??14", 'COALESCE("a", %s)', [14]),
             # Test contains operator.
-            ("'abcdf' contains 'bcd'", "%s like '%' || %s || '%'", ["abcdf", "bcd"]),
+            (
+                "'abcdf' contains 'bcd'",
+                (
+                    "%s like '%%' || REPLACE(REPLACE(REPLACE(%s, '\\', '\\\\'),"
+                    " '%%', '\\%%'), '_', '\\_') || '%%' ESCAPE '\\'"
+                ),
+                ["abcdf", "bcd"],
+            ),
             (
                 "Category contains 'Attempt'",
-                "array_to_string(\"category\", ',') like '%' || %s || '%'",
+                (
+                    'EXISTS (SELECT 1 FROM unnest("category") AS element WHERE '
+                    "element LIKE '%%' || REPLACE(REPLACE(REPLACE(%s, '\\', '\\\\'),"
+                    " '%%', '\\%%'), '_', '\\_') || '%%' ESCAPE '\\')"
+                ),
                 ["Attempt"],
             ),
             (
                 "['abcdfg', 'qwerty', 'azerty'] contains 'bcd'",
-                "array_to_string(ARRAY[%s, %s, %s], ',') like '%' || %s || '%'",
+                (
+                    "EXISTS (SELECT 1 FROM unnest(ARRAY[%s, %s, %s]) AS element "
+                    "WHERE element LIKE '%%' || REPLACE(REPLACE(REPLACE(%s, '\\', "
+                    "'\\\\'), '%%', '\\%%'), '_', '\\_') || '%%' ESCAPE '\\')"
+                ),
                 ["abcdfg", "qwerty", "azerty", "bcd"],
             ),
             # Test = operator.