From c2b3f1f91161b5aeac8a0559dd3f306ad5081053 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 4 Aug 2021 16:33:43 +0100 Subject: [PATCH] Add state key check --- .../sqlite3/deltas/2021041615092700_state_blocks_refactor.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roomserver/storage/sqlite3/deltas/2021041615092700_state_blocks_refactor.go b/roomserver/storage/sqlite3/deltas/2021041615092700_state_blocks_refactor.go index 0cf1f733a..8d0331748 100644 --- a/roomserver/storage/sqlite3/deltas/2021041615092700_state_blocks_refactor.go +++ b/roomserver/storage/sqlite3/deltas/2021041615092700_state_blocks_refactor.go @@ -100,8 +100,8 @@ func UpStateBlocksRefactor(tx *sql.Tx) error { // If we don't do this, we'll fail the assertions later on which try to ensure we didn't forget // any snapshots. _, err = tx.Exec( - `UPDATE roomserver_events SET state_snapshot_nid = 0 WHERE event_type_nid = $1 AND state_snapshot_nid = $2`, - types.MRoomCreateNID, snapshot, + `UPDATE roomserver_events SET state_snapshot_nid = 0 WHERE event_type_nid = $1 AND event_state_key_nid = $2 AND state_snapshot_nid = $3`, + types.MRoomCreateNID, types.EmptyStateKeyNID, snapshot, ) if err != nil { return fmt.Errorf("resetting create events snapshots to 0 errored: %s", err)