From eb1cb6ed5ff2fe0c1e237f4e7c9e9c130a89e8e7 Mon Sep 17 00:00:00 2001 From: Till Faelligen Date: Tue, 10 May 2022 16:15:04 +0200 Subject: [PATCH] Move []types.EventNID back to rows.Next() --- roomserver/storage/sqlite3/state_block_table.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roomserver/storage/sqlite3/state_block_table.go b/roomserver/storage/sqlite3/state_block_table.go index caf239a21..4e67d4da1 100644 --- a/roomserver/storage/sqlite3/state_block_table.go +++ b/roomserver/storage/sqlite3/state_block_table.go @@ -123,11 +123,11 @@ func (s *stateBlockStatements) BulkSelectStateBlockEntries( i := 0 var stateBlockNID types.StateBlockNID var result json.RawMessage - var r []types.EventNID for ; rows.Next(); i++ { if err = rows.Scan(&stateBlockNID, &result); err != nil { return nil, err } + var r []types.EventNID if err = json.Unmarshal(result, &r); err != nil { return nil, fmt.Errorf("json.Unmarshal: %w", err) }