Merge branch 'develop' of github.com:matrix-org/synapse

2014-11-26 15:17:40 +00:00 · 2014-11-26 15:17:40 +00:00 · 516deb22aa
parent 48ee9ddb22 4e2ffe79a4
commit 516deb22aa
1 changed files with 4 additions and 1 deletions
--- a/synapse/storage/init.py
+++ b/synapse/storage/init.py
@ -209,7 +209,10 @@ class DataStore(RoomMemberStore, RoomStore,
        self._store_state_groups_txn(txn, event)

        if current_state:
-            txn.execute("DELETE FROM current_state_events")
+            txn.execute(
+                "DELETE FROM current_state_events WHERE room_id = ?",
+                (event.room_id,)
+            )

            for s in current_state:
                self._simple_insert_txn(