Handle scan and close errors in SchemaHistory (#482)

Author: ryanslade

pkg/migrations/op_common_test.go

@@ -12,6 +12,7 @@ import (
 	"testing"
 
 	"github.com/lib/pq"
+	"github.com/stretchr/testify/assert"
 
 	"github.com/xataio/pgroll/internal/testutils"
 	"github.com/xataio/pgroll/pkg/migrations"
@@ -741,6 +742,7 @@ func MustSelect(t *testing.T, db *sql.DB, schema, version, table string) []map[s
 
 		res = append(res, row)
 	}
+	assert.NoError(t, q.Err())
 
 	return res
 }

pkg/roll/execute_test.go

@@ -903,6 +903,7 @@ func MustSelect(t *testing.T, db *sql.DB, schema, version, table string) []map[s
 
 		res = append(res, row)
 	}
+	assert.NoError(t, q.Err())
 
 	return res
 }

pkg/state/history.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/lib/pq"
+
 	"github.com/xataio/pgroll/pkg/migrations"
 )
 
@@ -33,16 +34,13 @@ func (s *State) SchemaHistory(ctx context.Context, schema string) ([]Migration,
 		return nil, err
 	}
 
-	defer rows.Close()
-
 	var entries []Migration
 	for rows.Next() {
 		var name, rawMigration string
 		var createdAt time.Time
 
-		rows.Scan(&name, &rawMigration, &createdAt)
-		if err != nil {
-			return nil, err
+		if err := rows.Scan(&name, &rawMigration, &createdAt); err != nil {
+			return nil, fmt.Errorf("row scan: %w", err)
 		}
 
 		var mig migrations.Migration
@@ -57,6 +55,10 @@ func (s *State) SchemaHistory(ctx context.Context, schema string) ([]Migration,
 		})
 	}
 
+	if err := rows.Err(); err != nil {
+		return nil, fmt.Errorf("iterating rows: %w", err)
+	}
+
 	return entries, nil
 }
 

pkg/state/state_test.go

@@ -240,7 +240,6 @@ func TestInferredMigration(t *testing.T) {
 				if err != nil {
 					t.Fatal(err)
 				}
-				defer rows.Close()
 
 				var gotMigrations []migrations.Migration
 				for rows.Next() {
@@ -254,6 +253,7 @@ func TestInferredMigration(t *testing.T) {
 					}
 					gotMigrations = append(gotMigrations, gotMigration)
 				}
+				assert.NoError(t, rows.Err())
 
 				assert.Equal(t, len(tt.wantMigrations), len(gotMigrations), "unexpected number of migrations")
 
@@ -296,7 +296,6 @@ func TestInferredMigrationsInTransactionHaveDifferentTimestamps(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		defer rows.Close()
 
 		type m struct {
 			name      string
@@ -313,6 +312,7 @@ func TestInferredMigrationsInTransactionHaveDifferentTimestamps(t *testing.T) {
 
 			migrations = append(migrations, migration)
 		}
+		assert.NoError(t, rows.Err())
 
 		// Ensure that the two inferred migrations have different timestamps
 		assert.Equal(t, 2, len(migrations), "unexpected number of migrations")