Add new operator for case insensitivity (#196)

OpenSlides · May 20, 2022 · 8bf3073 · 8bf3073
1 parent eacfa31
commit 8bf3073
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/datastore/shared/postgresql_backend/sql_query_helper.py b/datastore/shared/postgresql_backend/sql_query_helper.py
@@ -155,7 +155,10 @@ def build_filter_str(
                 condition = f"{table_alias}data->>%s {operator} NULL"
                 arguments += [filter.field]
             else:
-                condition = f"{table_alias}data->>%s {filter.operator} %s::text"
+                if filter.operator == "~=":
+                    condition = f"LOWER({table_alias}data->>%s) = LOWER(%s::text)"
+                else:
+                    condition = f"{table_alias}data->>%s {filter.operator} %s::text"
                 arguments += [filter.field, filter.value]
             return condition
         else:

diff --git a/datastore/shared/util/filter.py b/datastore/shared/util/filter.py
@@ -9,7 +9,7 @@
 @dataclass
 class FilterOperator(SelfValidatingDataclass):
     field: Field
-    operator: Literal["=", "!=", "<", ">", ">=", "<="]
+    operator: Literal["=", "!=", "<", ">", ">=", "<=", "~="]
     value: Any
 
 
@@ -45,7 +45,10 @@ class Or:
         "properties": {
             "field": {"type": "string"},
             "value": {},
-            "operator": {"type": "string", "enum": ["=", "!=", "<", ">", ">=", "<="]},
+            "operator": {
+                "type": "string",
+                "enum": ["=", "!=", "<", ">", ">=", "<=", "~="],
+            },
         },
         "required": ["field", "value", "operator"],
     },

diff --git a/tests/reader/system/filter/test_filter.py b/tests/reader/system/filter/test_filter.py
@@ -107,6 +107,19 @@ def test_leq(json_client, db_connection, db_cur):
     }
 
 
+def test_eq_ignore_case(json_client, db_connection, db_cur):
+    setup_data(db_connection, db_cur, data)
+    response = json_client.post(
+        Route.FILTER.URL,
+        {
+            "collection": "a",
+            "filter": {"field": "field_1", "operator": "~=", "value": "DATA"},
+        },
+    )
+    assert_success_response(response)
+    assert response.json == {"data": {"1": data["a/1"]}, "position": 3}
+
+
 def test_and(json_client, db_connection, db_cur):
     setup_data(db_connection, db_cur, data)
     response = json_client.post(