[core][fix] Turn off regexp rewriting (#2142)

Author: aquamatthias

fixcore/fixcore/db/arango_query.py

@@ -84,6 +84,8 @@
 regexp_leading_trailing = re.compile(r"(^\^?[.][*])|([.][*][$]?$)")
 # see: cli.py
 DefaultSort = [Sort("reported.kind"), Sort("reported.name"), Sort("reported.id")]
+# Disabled for the moment, since likes are case-sensitive and regex are not
+TranslateRegexpToLike = False
 
 
 class ArangoQueryContext:
@@ -170,7 +172,7 @@ def empty_and_simple(value: Any) -> bool:
         )
 
     def regexp_like(value: Any) -> Optional[str]:
-        if not isinstance(value, str):
+        if not TranslateRegexpToLike or not isinstance(value, str):
             return None
         ml = regexp_leading_trailing.sub("", value)
         ml = ml.replace("%", "\\%").replace("_", "\\_").replace(".*", "%").replace(".", "_")

fixcore/tests/fixcore/db/arango_query_test.py

@@ -12,6 +12,7 @@
     possible_values,
     load_time_series,
     history_query,
+    TranslateRegexpToLike,
 )
 from fixcore.db.graphdb import GraphDB
 from fixcore.db.model import QueryModel
@@ -438,12 +439,13 @@ def assert_view(query: str, expected: str, **kwargs: Any) -> Tuple[str, Json]:
     assert_view("g[*] in [1,2,3]", "SEARCH v0.g in @b0 RETURN v0)  FOR result in view0")
     assert_view("g[*] not in [1,2,3]", "SEARCH v0.g not in @b0 RETURN v0)  FOR result in view0")
     # use like instead of regex
-    assert_view('name=~"^123"', "SEARCH v0.name LIKE @b0", b0="123%")
-    assert_view('name=~"^.*123$"', "SEARCH v0.name LIKE @b0", b0="%123")
-    assert_view('name=~".*123$"', "SEARCH v0.name LIKE @b0", b0="%123")
-    assert_view('name=~"^123$"', "SEARCH v0.name LIKE @b0", b0="123")
-    assert_view('name=~"^%1%2%.*3%$"', "SEARCH v0.name LIKE @b0", b0="\\%1\\%2\\%%3\\%")
-    assert_view('name=~"^...$"', "SEARCH v0.name LIKE @b0", b0="___")
+    if TranslateRegexpToLike:
+        assert_view('name=~"^123"', "SEARCH v0.name LIKE @b0", b0="123%")
+        assert_view('name=~"^.*123$"', "SEARCH v0.name LIKE @b0", b0="%123")
+        assert_view('name=~".*123$"', "SEARCH v0.name LIKE @b0", b0="%123")
+        assert_view('name=~"^123$"', "SEARCH v0.name LIKE @b0", b0="123")
+        assert_view('name=~"^%1%2%.*3%$"', "SEARCH v0.name LIKE @b0", b0="\\%1\\%2\\%%3\\%")
+        assert_view('name=~"^...$"', "SEARCH v0.name LIKE @b0", b0="___")
 
     # cannot use like since regex cannot be expressed as glob. needs filter
     assert_view('name=~"123[0-9]+"',