summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-07-29 17:09:01 +0100
committerGitHub <noreply@github.com>2019-07-29 17:09:01 +0100
commit2a12d76646de2477feb477295dc5352dd08bf63b (patch)
tree7131c8dcebe66732cf0a7a914c45536fe7ce743c /synapse
parent Move some timeout checking logs to DEBUG #5785 (diff)
parentNewsfile (diff)
downloadsynapse-2a12d76646de2477feb477295dc5352dd08bf63b.tar.xz
Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqlite
Fix current_state bg update to work on old SQLite
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/roommember.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py

index cb88e49b51..a1b9fd8199 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py
@@ -870,10 +870,10 @@ class RoomMemberStore(RoomMemberWorkerStore): next_room, = row sql = """ - UPDATE current_state_events AS c + UPDATE current_state_events SET membership = ( SELECT membership FROM room_memberships - WHERE event_id = c.event_id + WHERE event_id = current_state_events.event_id ) WHERE room_id = ? """