tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Fix on sqlite: use left rather than outer join

Browse source
This commit is contained in:
Erik Johnston 2017-01-26 16:55:50 +00:00
parent 76d40f4904
commit 31aca5589c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
synapse/storage/end_to_end_keys.py
View file

@ -65,11 +65,11 @@ class EndToEndKeyStore(SQLBaseStore):
"SELECT user_id, device_id, " "SELECT user_id, device_id, "
" d.display_name AS device_display_name, " " d.display_name AS device_display_name, "
" k.key_json" " k.key_json"
" FROM e2e_device_keys_json k" " FROM devices d"
" %s JOIN devices d USING (user_id, device_id)" " %s JOIN e2e_device_keys_json k USING (user_id, device_id)"
" WHERE %s" " WHERE %s"
) % ( ) % (
"FULL OUTER" if include_all_devices else "LEFT", "LEFT" if include_all_devices else "INNER",
" OR ".join("(" + q + ")" for q in query_clauses) " OR ".join("(" + q + ")" for q in query_clauses)
) )