Advanced query search syntax for multi byte search

Author: yoshiokatsuneo

redash/models/__init__.py

@@ -2,6 +2,7 @@
 import datetime
 import logging
 import numbers
+import re
 import time
 
 import pytz
@@ -644,6 +645,47 @@ def outdated_queries(cls):
 
         return list(outdated_queries.values())
 
+    @classmethod
+    def _do_multi_byte_search(cls, all_queries, term, limit=None):
+        # term examples:
+        #    - word
+        #    - name:word
+        #    - query:word
+        #    - "multiple words"
+        #    - name:"multiple words"
+        #    - word1 word2 word3
+        #    - word1 "multiple word" query:"select foo"
+        tokens = re.findall(r'(?:([^:\s]+):)?(?:"([^"]+)"|(\S+))', term)
+        conditions = []
+        for token in tokens:
+            key = None
+            if token[0]:
+                key = token[0]
+
+            if token[1]:
+                value = token[1]
+            else:
+                value = token[2]
+
+            pattern = f"%{value}%"
+
+            if key == "id" and value.isdigit():
+                conditions.append(cls.id.equal(int(value)))
+            elif key == "name":
+                conditions.append(cls.name.ilike(pattern))
+            elif key == "query":
+                conditions.append(cls.query_text.ilike(pattern))
+            elif key == "description":
+                conditions.append(cls.description.ilike(pattern))
+            else:
+                conditions.append(or_(cls.name.ilike(pattern), cls.description.ilike(pattern)))
+
+        return (
+            all_queries.filter(and_(*conditions))
+            .order_by(Query.id)
+            .limit(limit)
+        )
+
     @classmethod
     def search(
         cls,
@@ -664,12 +706,7 @@ def search(
 
         if multi_byte_search:
             # Since tsvector doesn't work well with CJK languages, use `ilike` too
-            pattern = "%{}%".format(term)
-            return (
-                all_queries.filter(or_(cls.name.ilike(pattern), cls.description.ilike(pattern)))
-                .order_by(Query.id)
-                .limit(limit)
-            )
+            return cls._do_multi_byte_search(all_queries, term, limit)
 
         # sort the result using the weight as defined in the search vector column
         return all_queries.search(term, sort=True).limit(limit)