summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-07-25 11:55:45 +0100
committerGitHub <noreply@github.com>2018-07-25 11:55:45 +0100
commit32b30e15f27b8753a43dd4c793aca42230d77124 (patch)
tree7da6efb16c42a12f123d791a034bf80383fe2c12 /synapse/storage
parentMerge pull request #3605 from matrix-org/rav/fix_update_remote_profile_cache (diff)
parentFix occasional 'tuple index out of range' error (diff)
downloadsynapse-32b30e15f27b8753a43dd4c793aca42230d77124.tar.xz
Merge pull request #3607 from matrix-org/rav/fix_persist_events_integrity_error
Fix occasional 'tuple index out of range' error
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/events.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 906a405031..f7c4226ea2 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -1137,7 +1137,7 @@ class EventsStore(EventsWorkerStore):
         ):
             txn.executemany(
                 "DELETE FROM %s WHERE room_id = ? AND event_id = ?" % (table,),
-                [(ev.event_id,) for ev, _ in events_and_contexts]
+                [(ev.room_id, ev.event_id) for ev, _ in events_and_contexts]
             )
 
     def _store_event_txn(self, txn, events_and_contexts):