fix search query to focus on strings only

Author: mikez

things/api.py

@@ -90,9 +90,10 @@ def tasks(uuid=None, include_items=False, **kwargs):  # noqa: C901
         If the argument is `True`, only include tasks _with_ a due date.
         If the argument is `None` (default), then include all tasks.
 
-    search_query : str, bool, or None, optional
+    search_query : str, optional
         The string value is passed to the SQL LIKE operator. It can thus
-        include placeholders such as '%' and '_'.
+        include placeholders such as '%' and '_'. Per default, it is
+        wrapped in '% ... %'.
 
         Currently titles and notes of to-dos, projects, headings, and areas
         are taken into account.
@@ -332,8 +333,8 @@ def search(query: str, **kwargs) -> List[Dict]:
     """
     Search tasks in the database.
 
-    Currently titles and notes of to-dos, projects, headings, and areas
-    are taken into account.
+    Currently any part of a title and note of a to-do, project,
+    heading, or area is matched.
 
     See the `search_query` parameter of `api.tasks` for details.
 
@@ -348,6 +349,7 @@ def search(query: str, **kwargs) -> List[Dict]:
       'type': 'to-do',
       'title': 'Book flights',
       ...}]
+
     >>> things.search('book%room')
     [{'uuid': 'YrOmUnEXASmpq8ch6RsyPt',
       'type': 'to-do',

things/database.py

@@ -676,59 +676,16 @@ def make_search_filter(query: str) -> str:
         OR TASK.notes LIKE "%dinner%"
         OR AREA.title LIKE "%dinner%"
     )'
-
-    >>> make_search_filter(False)
-    'AND (
-        TASK.title LIKE "%%"
-        OR TASK.notes LIKE "%%"
-        OR AREA.title LIKE "%%"
-    )'
-
-    >>> make_search_filter('')
-    'AND (
-        TASK.title IS NULL
-        OR TASK.notes IS NULL
-        OR AREA.title IS NULL
-    )'
-
-    >>> make_search_filter(None)
-    ''
     """
-    result = ""
+    if not query:
+        return ""
 
     # noqa todo 'TMChecklistItem.title'
-    sources = ["TASK.title", "TASK.notes", "AREA.title"]
-    sub_searches = (make_sub_search_filter(source, query) for source in sources)
-    result = " OR ".join(filter(None, sub_searches))
+    columns = ["TASK.title", "TASK.notes", "AREA.title"]
 
-    if result:
-        result = f"AND ({result})"
-
-    return result
+    sub_searches = (f'{column} LIKE "%{query}%"' for column in columns)
 
-
-def make_sub_search_filter(column, query):
-    """
-    Examples
-    --------
-    >>> make_sub_search_filter('TASK.title', 'dinner')
-    'TASK.title LIKE "%dinner%"'
-
-    >>> make_sub_search_filter('TASK.title', None)
-    ''
-
-    >>> make_sub_search_filter('TASK.title', False)
-    'TASK.title IS NULL'
-
-    >>> make_sub_search_filter('TASK.title', True)
-    'TASK.title IS NOT NULL'
-    """
-    default = f'{column} LIKE "%{query}%"'
-    return {
-        None: "",
-        False: f"{column} IS NULL",
-        True: f"{column} IS NOT NULL",
-    }.get(query, default)
+    return f"AND ({' OR '.join(sub_searches)})"
 
 
 def validate(parameter, argument, valid_arguments):