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

Merge pull request #289 from matrix-org/markjh/fix_sql

Browse source 
Fix order of ON constraints in _get_rooms_for_user_where_membership
This commit is contained in:
Erik Johnston 2015-09-24 17:39:47 +01:00
commit 17795161c3
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
synapse/storage/roommember.py
View file

@ -142,12 +142,12 @@ class RoomMemberStore(SQLBaseStore):
sql = ( sql = (
"SELECT m.room_id, m.sender, m.membership, m.event_id, e.stream_ordering" "SELECT m.room_id, m.sender, m.membership, m.event_id, e.stream_ordering"
" FROM room_memberships as m" " FROM current_state_events as c"
" INNER JOIN current_state_events as c" " INNER JOIN room_memberships as m"
" ON e.event_id = c.event_id " " ON m.event_id = c.event_id"
" INNER JOIN events as e " " INNER JOIN events as e"
" ON m.event_id = c.event_id " " ON e.event_id = c.event_id"
" AND m.room_id = c.room_id " " AND m.room_id = c.room_id"
" AND m.user_id = c.state_key" " AND m.user_id = c.state_key"
" WHERE %s" " WHERE %s"
) % (where_clause,) ) % (where_clause,)