summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-03-28 11:19:45 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-03-28 11:19:45 +0100
commit545001b9e4b1d6710145d3efe2117fbdf823fb38 (patch)
tree8b522d903f65166550551cb4201a7961b8d6880b /synapse
parentfix tests/storage/test_user_directory.py (diff)
downloadsynapse-545001b9e4b1d6710145d3efe2117fbdf823fb38.tar.xz
Fix search_user_dir multiple sqlite versions do different things
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/user_directory.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/user_directory.py b/synapse/storage/user_directory.py

index dfdcbb3181..d6e289ffbe 100644 --- a/synapse/storage/user_directory.py +++ b/synapse/storage/user_directory.py
@@ -667,7 +667,7 @@ class UserDirectoryStore(SQLBaseStore): # The array of numbers are the weights for the various part of the # search: (domain, _, display name, localpart) sql = """ - SELECT d.user_id, display_name, avatar_url + SELECT d.user_id AS user_id, display_name, avatar_url FROM user_directory_search INNER JOIN user_directory AS d USING (user_id) %s @@ -702,7 +702,7 @@ class UserDirectoryStore(SQLBaseStore): search_query = _parse_query_sqlite(search_term) sql = """ - SELECT d.user_id, display_name, avatar_url + SELECT d.user_id AS user_id, display_name, avatar_url FROM user_directory_search INNER JOIN user_directory AS d USING (user_id) %s