diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-04-11 10:59:00 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-04-11 10:59:00 +0100 |
| commit | 427e6c4059e2eff5eacf114dc6708e2972ca36d2 (patch) | |
| tree | 608df478fe94531db9a789e3c8d1e827a34d8302 /synapse/storage/user_directory.py | |
| parent | Update README.rst (diff) | |
| parent | bump version/changelog (diff) | |
| download | synapse-427e6c4059e2eff5eacf114dc6708e2972ca36d2.tar.xz | |
Merge branch 'release-v0.27.0' of https://github.com/matrix-org/synapse v0.27.3
Diffstat (limited to 'synapse/storage/user_directory.py')
| -rw-r--r-- | synapse/storage/user_directory.py | 4 |
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 |