summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-07-30 15:20:09 +0100
committerGitHub <noreply@github.com>2019-07-30 15:20:09 +0100
commit62a2d60d7206cd99c38a26f113dc2a2030a5c6b2 (patch)
tree6b4841c77f50603375cc63538fc76e6ca30469a8 /synapse
parentMerge pull request #5789 from matrix-org/erikj/fix_error_handling_keys (diff)
parentNewsfile (diff)
downloadsynapse-62a2d60d7206cd99c38a26f113dc2a2030a5c6b2.tar.xz
Merge pull request #5792 from matrix-org/erikj/fix_bg_update
Fix current_state_events membership background update.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/roommember.py2
-rw-r--r--synapse/storage/schema/delta/56/current_state_events_membership_mk2.sql (renamed from synapse/storage/schema/delta/56/current_state_events_membership.sql)0
2 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py

index e60409ed73..eecb276465 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py
@@ -935,7 +935,7 @@ class RoomMemberStore(RoomMemberWorkerStore): while processed < batch_size: txn.execute( """ - SELECT MIN(room_id) FROM rooms WHERE room_id > ? + SELECT MIN(room_id) FROM current_state_events WHERE room_id > ? """, (last_processed_room,), ) diff --git a/synapse/storage/schema/delta/56/current_state_events_membership.sql b/synapse/storage/schema/delta/56/current_state_events_membership_mk2.sql
index b2e08cd85d..b2e08cd85d 100644 --- a/synapse/storage/schema/delta/56/current_state_events_membership.sql +++ b/synapse/storage/schema/delta/56/current_state_events_membership_mk2.sql