diff options
| author | Erik Johnston <erik@matrix.org> | 2017-01-26 16:55:50 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-01-26 16:55:50 +0000 |
| commit | 31aca5589c3790201b2087e28d2901d00e1f77d5 (patch) | |
| tree | bde34fd8bee294842c2552fc38113ce9dc5ba2d1 /synapse | |
| parent | Handle users leaving rooms (diff) | |
| download | synapse-31aca5589c3790201b2087e28d2901d00e1f77d5.tar.xz | |
Fix on sqlite: use left rather than outer join
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/end_to_end_keys.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/end_to_end_keys.py b/synapse/storage/end_to_end_keys.py index a915c790ff..441286d1a1 100644 --- a/synapse/storage/end_to_end_keys.py +++ b/synapse/storage/end_to_end_keys.py @@ -65,11 +65,11 @@ class EndToEndKeyStore(SQLBaseStore): "SELECT user_id, device_id, " " d.display_name AS device_display_name, " " k.key_json" - " FROM e2e_device_keys_json k" - " %s JOIN devices d USING (user_id, device_id)" + " FROM devices d" + " %s JOIN e2e_device_keys_json k USING (user_id, device_id)" " 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) ) |