diff options
| author | Erik Johnston <erik@matrix.org> | 2015-09-24 17:39:47 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-09-24 17:39:47 +0100 |
| commit | 17795161c3c7449f9defa5531922a2a148924fbe (patch) | |
| tree | bfe10d1ec7c2198d9840657269bb9ab829e63ddb /synapse/storage | |
| parent | Fix demo/start.sh to work with --report-stats (diff) | |
| parent | Fix order of ON constraints in _get_rooms_for_user_where_membership_is_txn (diff) | |
| download | synapse-17795161c3c7449f9defa5531922a2a148924fbe.tar.xz | |
Merge pull request #289 from matrix-org/markjh/fix_sql
Fix order of ON constraints in _get_rooms_for_user_where_membership
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/roommember.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index cd9eefbd9f..41c939efb1 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -142,12 +142,12 @@ class RoomMemberStore(SQLBaseStore): sql = ( "SELECT m.room_id, m.sender, m.membership, m.event_id, e.stream_ordering" - " FROM room_memberships as m" - " INNER JOIN current_state_events as c" - " ON e.event_id = c.event_id " - " INNER JOIN events as e " - " ON m.event_id = c.event_id " - " AND m.room_id = c.room_id " + " FROM current_state_events as c" + " INNER JOIN room_memberships as m" + " ON m.event_id = c.event_id" + " INNER JOIN events as e" + " ON e.event_id = c.event_id" + " AND m.room_id = c.room_id" " AND m.user_id = c.state_key" " WHERE %s" ) % (where_clause,) |