Fix CI regressions and stabilize tests
This commit is contained in:
@@ -2,24 +2,30 @@ package migrations
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
func MigrateExternalRefColumn(db *sql.DB) error {
|
||||
func MigrateExternalRefColumn(db *sql.DB) (retErr error) {
|
||||
var columnExists bool
|
||||
rows, err := db.Query("PRAGMA table_info(issues)")
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to check schema: %w", err)
|
||||
}
|
||||
defer func() {
|
||||
if rows != nil {
|
||||
if closeErr := rows.Close(); closeErr != nil {
|
||||
retErr = errors.Join(retErr, fmt.Errorf("failed to close schema rows: %w", closeErr))
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
for rows.Next() {
|
||||
var cid int
|
||||
var name, typ string
|
||||
var notnull, pk int
|
||||
var dflt *string
|
||||
err := rows.Scan(&cid, &name, &typ, ¬null, &dflt, &pk)
|
||||
if err != nil {
|
||||
rows.Close()
|
||||
if err := rows.Scan(&cid, &name, &typ, ¬null, &dflt, &pk); err != nil {
|
||||
return fmt.Errorf("failed to scan column info: %w", err)
|
||||
}
|
||||
if name == "external_ref" {
|
||||
@@ -29,12 +35,14 @@ func MigrateExternalRefColumn(db *sql.DB) error {
|
||||
}
|
||||
|
||||
if err := rows.Err(); err != nil {
|
||||
rows.Close()
|
||||
return fmt.Errorf("error reading column info: %w", err)
|
||||
}
|
||||
|
||||
// Close rows before executing any statements to avoid deadlock with MaxOpenConns(1)
|
||||
rows.Close()
|
||||
// Close rows before executing any statements to avoid deadlock with MaxOpenConns(1).
|
||||
if err := rows.Close(); err != nil {
|
||||
return fmt.Errorf("failed to close schema rows: %w", err)
|
||||
}
|
||||
rows = nil
|
||||
|
||||
if !columnExists {
|
||||
_, err := db.Exec(`ALTER TABLE issues ADD COLUMN external_ref TEXT`)
|
||||
|
||||
Reference in New Issue
Block a user