Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-01-20 03:11:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2803 from matrix-org/matthew/fix-userdir-sql

Browse Source 
fix SQL when searching all users
This commit is contained in:
Matthew Hodgson 2018-01-17 16:27:54 +00:00 committed by GitHub
commit 06db5c4b76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
synapse/storage/user_directory.py
View File

@ -641,8 +641,13 @@ class UserDirectoryStore(SQLBaseStore):
""" """
if self.hs.config.user_directory_search_all_users: if self.hs.config.user_directory_search_all_users:
join_clause = "" # dummy to keep the number of binds & aliases the same
where_clause = "?<>''" # naughty hack to keep the same number of binds join_clause = """
LEFT JOIN (
SELECT NULL as user_id WHERE NULL = ?
) AS s USING (user_id)"
"""
where_clause = ""
else: else:
join_clause = """ join_clause = """
LEFT JOIN users_in_public_rooms AS p USING (user_id) LEFT JOIN users_in_public_rooms AS p USING (user_id)