summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-07 12:21:17 +0100
committerErik Johnston <erik@matrix.org>2019-10-07 12:21:17 +0100
commit5119a4cac7f42691beb455eedbefd99a39d64897 (patch)
treea469aef1c3fd3cf2563333254573c10ebecfadf4 /synapse
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/cache_memb... (diff)
downloadsynapse-5119a4cac7f42691beb455eedbefd99a39d64897.tar.xz
Fix bug where we didn't pull out event ID
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/roommember.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index 81a9ab6dc8..59a89fad60 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -612,7 +612,7 @@ class RoomMemberWorkerStore(EventsWorkerStore):
             table="room_memberships",
             column="event_id",
             iterable=event_ids,
-            retcols=("user_id", "display_name", "avatar_url"),
+            retcols=("user_id", "display_name", "avatar_url", "event_id"),
             keyvalues={"membership": Membership.JOIN},
             batch_size=500,
             desc="_get_membership_from_event_ids",