synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-13 21:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hugo Dutka
2025-06-18 21:44:58 +02:00
committed by GitHub
parent 7849794701
commit 4039327b1a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cli/server.go
View File

@ -2360,10 +2360,12 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d
return nil, xerrors.Errorf("get postgres version: %w", err) return nil, xerrors.Errorf("get postgres version: %w", err)
} }
defer version.Close() defer version.Close()
if version.Err() != nil {
return nil, xerrors.Errorf("version select: %w", version.Err())
}
if !version.Next() { 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") return nil, xerrors.Errorf("no rows returned for version select")
} }
var versionNum int var versionNum int