Skip to content

chore: check version.Err() after version.Next() in ConnectToPostgres #18437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2025
Merged

chore: check version.Err() after version.Next() in ConnectToPostgres #18437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions cli/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2360,10 +2360,12 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d
return nil, xerrors.Errorf("get postgres version: %w", err)
}
defer version.Close()
if version.Err() != nil {
return nil, xerrors.Errorf("version select: %w", version.Err())
}
if !version.Next() {
// it's critical we assign to the err variable, otherwise the defer statement
// that runs db.Close() will not execute it
if err = version.Err(); err != nil {
return nil, xerrors.Errorf("no rows returned for version select: %w", err)
}
return nil, xerrors.Errorf("no rows returned for version select")
}
var versionNum int
Expand Down
Loading