use the old method

This commit is contained in:
Amber Brown 2019-03-12 17:51:14 +11:00
parent 78a6b950b3
commit c980c7e31f

View File

@ -641,12 +641,11 @@ class UserDirectoryStore(BackgroundUpdateStore):
where_clause = "1=1" where_clause = "1=1"
else: else:
join_clause = """ join_clause = """
LEFT JOIN users_in_public_rooms AS p USING (user_id)
LEFT JOIN ( LEFT JOIN (
SELECT user_id FROM users_in_public_rooms
UNION
SELECT other_user_id AS user_id FROM users_who_share_private_rooms SELECT other_user_id AS user_id FROM users_who_share_private_rooms
WHERE user_id = ? WHERE user_id = ?
) AS p USING (user_id) ) AS s USING (user_id)
""" """
join_args = (user_id,) join_args = (user_id,)
where_clause = "p.user_id IS NOT NULL" where_clause = "p.user_id IS NOT NULL"