diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-01-17 15:58:52 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-01-17 15:58:52 +0000 |
| commit | 2d9ab533f9faa3f98eea166b05d3a0fb7fc2f80c (patch) | |
| tree | 95cff296b04b08ea09d47c8b54135e86b851d6cb /synapse/storage | |
| parent | Merge pull request #2795 from matrix-org/rav/track_db_scheduling (diff) | |
| download | synapse-2d9ab533f9faa3f98eea166b05d3a0fb7fc2f80c.tar.xz | |
fix SQL when searching all users
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/user_directory.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/synapse/storage/user_directory.py b/synapse/storage/user_directory.py index c9bff408ef..f150ef0103 100644 --- a/synapse/storage/user_directory.py +++ b/synapse/storage/user_directory.py @@ -641,8 +641,13 @@ class UserDirectoryStore(SQLBaseStore): """ if self.hs.config.user_directory_search_all_users: - join_clause = "" - where_clause = "?<>''" # naughty hack to keep the same number of binds + # dummy to keep the number of binds & aliases the same + join_clause = """ + LEFT JOIN ( + SELECT NULL as user_id WHERE NULL = ? + ) AS s USING (user_id)" + """ + where_clause = "" else: join_clause = """ LEFT JOIN users_in_public_rooms AS p USING (user_id) |