Merge pull request #3607 from matrix-org/rav/fix_persist_events_integrity_error

Fix occasional 'tuple index out of range' error
This commit is contained in:
Richard van der Hoff 2018-07-25 11:55:45 +01:00 committed by GitHub
commit 32b30e15f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

1
changelog.d/3607.bugfix Normal file
View File

@ -0,0 +1 @@
Fix 'tuple index out of range' error

View File

@ -1137,7 +1137,7 @@ class EventsStore(EventsWorkerStore):
): ):
txn.executemany( txn.executemany(
"DELETE FROM %s WHERE room_id = ? AND event_id = ?" % (table,), "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): def _store_event_txn(self, txn, events_and_contexts):