summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-11-30 01:34:03 +0000
committerMatthew Hodgson <matthew@matrix.org>2017-11-30 01:34:03 +0000
commit4b1fceb913dbcd7472346e2d31c6cd4d99424f9a (patch)
treedde61576d6431c6c8990561edb293fd62c446f8e
parentfix thinkos galore (diff)
downloadsynapse-4b1fceb913dbcd7472346e2d31c6cd4d99424f9a.tar.xz
fix alternation operator for FTS4 - how did this ever work!?
-rw-r--r--synapse/storage/user_directory.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/user_directory.py b/synapse/storage/user_directory.py

index d8c9657125..44b7d8906a 100644 --- a/synapse/storage/user_directory.py +++ b/synapse/storage/user_directory.py
@@ -748,7 +748,7 @@ def _parse_query_sqlite(search_term): # Pull out the individual words, discarding any non-word characters. results = re.findall(r"([\w\-]+)", search_term, re.UNICODE) - return " & ".join("(%s* | %s)" % (result, result,) for result in results) + return " & ".join("(%s* OR %s)" % (result, result,) for result in results) def _parse_query_postgres(search_term):