Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

fix tests/storage/test_user_directory.py #3042

Merged
merged 2 commits into from
Mar 28, 2018
Merged

fix tests/storage/test_user_directory.py #3042

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9cb1a3
fix tests/storage/test_user_directory.py
neilisfragile Mar 28, 2018
545001b
Fix search_user_dir multiple sqlite versions do different things
neilisfragile Mar 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions synapse/storage/user_directory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ def search_user_dir(self, user_id, search_term, limit):
# 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
Expand Down Expand Up @@ -702,7 +702,7 @@ def search_user_dir(self, user_id, search_term, limit):
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
Expand Down