defer rows.Close()

This commit is contained in:
Tim Van Baak 2025-01-31 16:01:47 -08:00
parent 8940fdf697
commit 3f533d568a
5 changed files with 24 additions and 0 deletions

View File

@ -42,6 +42,7 @@ func GetActionsForSource(db DB, source string) ([]string, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer rows.Close()
var names []string var names []string
for rows.Next() { for rows.Next() {
var name string var name string
@ -51,6 +52,9 @@ func GetActionsForSource(db DB, source string) ([]string, error) {
} }
names = append(names, name) names = append(names, name)
} }
if err := rows.Err(); err != nil {
return nil, err
}
return names, nil return names, nil
} }

View File

@ -14,6 +14,7 @@ func GetEnvs(db DB, source string) ([]string, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer rows.Close()
var envs []string var envs []string
for rows.Next() { for rows.Next() {
var name string var name string
@ -23,6 +24,9 @@ func GetEnvs(db DB, source string) ([]string, error) {
} }
envs = append(envs, fmt.Sprintf("%s=%s", name, value)) envs = append(envs, fmt.Sprintf("%s=%s", name, value))
} }
if err := rows.Err(); err != nil {
return nil, err
}
return envs, nil return envs, nil
} }

View File

@ -128,6 +128,7 @@ func getItems(db DB, query string, args ...any) ([]Item, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer rows.Close()
var items []Item var items []Item
for rows.Next() { for rows.Next() {
var item Item var item Item
@ -137,6 +138,9 @@ func getItems(db DB, query string, args ...any) ([]Item, error) {
} }
items = append(items, item) items = append(items, item)
} }
if err := rows.Err(); err != nil {
return nil, err
}
return items, nil return items, nil
} }

View File

@ -23,6 +23,7 @@ func InitDatabase(db DB) error {
if err != nil { if err != nil {
return err return err
} }
defer rows.Close()
var exists bool var exists bool
for rows.Next() { for rows.Next() {
@ -31,6 +32,9 @@ func InitDatabase(db DB) error {
return err return err
} }
} }
if err := rows.Err(); err != nil {
return err
}
if exists { if exists {
return nil return nil
@ -56,6 +60,7 @@ func GetPendingMigrations(db DB) (map[string]bool, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer rows.Close()
for rows.Next() { for rows.Next() {
var name string var name string
err = rows.Scan(&name) err = rows.Scan(&name)
@ -64,6 +69,9 @@ func GetPendingMigrations(db DB) (map[string]bool, error) {
} }
complete[name] = true complete[name] = true
} }
if err := rows.Err(); err != nil {
return nil, err
}
return complete, nil return complete, nil
} }

View File

@ -25,6 +25,7 @@ func GetSources(db DB) ([]string, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer rows.Close()
var names []string var names []string
for rows.Next() { for rows.Next() {
var name string var name string
@ -33,6 +34,9 @@ func GetSources(db DB) ([]string, error) {
} }
names = append(names, name) names = append(names, name)
} }
if err := rows.Err(); err != nil {
return nil, err
}
return names, nil return names, nil
} }