Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More join conditions

This commit is contained in:
Erik Johnston 2015-04-30 18:41:05 +01:00
parent 6ead27ddda
commit 61d05daab1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/storage/roommember.py
View File

@ -154,7 +154,9 @@ class RoomMemberStore(SQLBaseStore):
"SELECT m.room_id, m.sender, m.membership" "SELECT m.room_id, m.sender, m.membership"
" FROM room_memberships as m" " FROM room_memberships as m"
" INNER JOIN current_state_events as c" " INNER JOIN current_state_events as c"
" ON m.event_id = c.event_id" " ON m.event_id = c.event_id "
" AND m.room_id = c.room_id "
" AND m.user_id = c.state_key"
" WHERE %s" " WHERE %s"
) % (where_clause,) ) % (where_clause,)
@ -212,7 +214,9 @@ class RoomMemberStore(SQLBaseStore):
sql = ( sql = (
"SELECT m.* FROM room_memberships as m" "SELECT m.* FROM room_memberships as m"
" INNER JOIN current_state_events as c" " INNER JOIN current_state_events as c"
" ON m.event_id = c.event_id AND m.room_id = c.room_id " " ON m.event_id = c.event_id "
" AND m.room_id = c.room_id "
" AND m.user_id = c.state_key"
" WHERE %(where)s" " WHERE %(where)s"
) % { ) % {
"where": where_clause, "where": where_clause,