summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-16 10:50:24 +0100
committerErik Johnston <erik@matrix.org>2016-08-16 10:50:24 +0100
commit6cbd1b495ea42b0ae6dcda34652bed75804a2eea (patch)
tree86de8b0cf6ce89fb17041c2ddbfcfde406bee4c2
parentMerge pull request #1009 from matrix-org/erikj/event_split (diff)
parentAdd missing database corruption recovery case (diff)
downloadsynapse-6cbd1b495ea42b0ae6dcda34652bed75804a2eea.tar.xz
Merge branch 'fix_integrity_retry' of https://github.com/Ralith/synapse into Ralith-fix_integrity_retry
-rw-r--r--synapse/storage/events.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index d2feee8dbb..ad026b5e0b 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -600,7 +600,8 @@ class EventsStore(SQLBaseStore):
                 "rejections",
                 "redactions",
                 "room_memberships",
-                "state_events"
+                "state_events",
+                "topics"
             ):
                 txn.executemany(
                     "DELETE FROM %s WHERE event_id = ?" % (table,),