diff options
| author | Erik Johnston <erikj@jki.re> | 2018-03-28 13:10:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-28 13:10:37 +0100 |
| commit | e9e4cb25fc3143bb3a3a06f16bbc591ab0fe9a49 (patch) | |
| tree | 8b522d903f65166550551cb4201a7961b8d6880b /synapse | |
| parent | Merge pull request #3029 from matrix-org/erikj/linearize_generate_user_id (diff) | |
| parent | Fix search_user_dir multiple sqlite versions do different things (diff) | |
| download | synapse-e9e4cb25fc3143bb3a3a06f16bbc591ab0fe9a49.tar.xz | |
Merge pull request #3042 from matrix-org/fix_locally_failing_tests
fix tests/storage/test_user_directory.py
Diffstat (limited to 'synapse')
| -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 |