Fixup membership query

matrix-org · Dec 14, 2016 · c3208e4 · c3208e4
1 parent bae1115
commit c3208e4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
@@ -483,9 +483,9 @@ def _background_add_membership_profile(self, progress, batch_size):
 
         def add_membership_profile_txn(txn):
             sql = ("""
-                SELECT stream_ordering, event_id, room_id, content
+                SELECT stream_ordering, event_id, events.room_id, content
                 FROM events
-                INNER JOIN room_memberships USING (room_id, event_id)
+                INNER JOIN room_memberships USING (event_id)
                 WHERE ? <= stream_ordering AND stream_ordering < ?
                 AND type = 'm.room.member'
                 ORDER BY stream_ordering DESC