From e5b4e75357e87dc81389cfc3f72439759c3a2005 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Wed, 21 Apr 2021 10:17:21 +0100
Subject: [PATCH] Use Query

---
 .../deltas/2021041615092700_state_blocks_refactor.go   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go b/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go
index f635e1788..3cba3bce8 100644
--- a/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go
+++ b/roomserver/storage/postgres/deltas/2021041615092700_state_blocks_refactor.go
@@ -65,7 +65,7 @@ func UpStateBlocksRefactor(tx *sql.Tx) error {
 	if _, err := tx.Exec(`ALTER TABLE roomserver_state_snapshots RENAME TO _roomserver_state_snapshots;`); err != nil {
 		return fmt.Errorf("tx.Exec: %w", err)
 	}
-	_, err := tx.Exec(`
+	createblock, err := tx.Query(`
 		DROP SEQUENCE IF EXISTS roomserver_state_block_nid_seq;
 		CREATE SEQUENCE roomserver_state_block_nid_seq START WITH $1;
 
@@ -78,7 +78,10 @@ func UpStateBlocksRefactor(tx *sql.Tx) error {
 	if err != nil {
 		return fmt.Errorf("tx.Exec: %w", err)
 	}
-	_, err = tx.Exec(`
+	if err = createblock.Close(); err != nil {
+		return fmt.Errorf("snapshots.Close: %w", err)
+	}
+	createsnapshot, err := tx.Query(`
 		DROP SEQUENCE IF EXISTS roomserver_state_snapshot_nid_seq;
 		CREATE SEQUENCE roomserver_state_snapshot_nid_seq START WITH $1;
 
@@ -92,6 +95,9 @@ func UpStateBlocksRefactor(tx *sql.Tx) error {
 	if err != nil {
 		return fmt.Errorf("tx.Exec: %w", err)
 	}
+	if err = createsnapshot.Close(); err != nil {
+		return fmt.Errorf("snapshots.Close: %w", err)
+	}
 	logrus.Warn("New tables created...")
 
 	batchsize := 100