Commit4039327

authored

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

1 parent7849794 commit4039327Copy full SHA for 4039327

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2360,10 +2360,12 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d`
`2360`	`2360`	`returnnil,xerrors.Errorf("get postgres version: %w",err)`
`2361`	`2361`	`}`
`2362`	`2362`	`deferversion.Close()`
`2363`		`-ifversion.Err()!=nil {`
`2364`		`-returnnil,xerrors.Errorf("version select: %w",version.Err())`
`2365`		`-}`
`2366`	`2363`	`if!version.Next() {`
	`2364`	`+// it's critical we assign to the err variable, otherwise the defer statement`
	`2365`	`+// that runs db.Close() will not execute it`
	`2366`	`+iferr=version.Err();err!=nil {`
	`2367`	`+returnnil,xerrors.Errorf("no rows returned for version select: %w",err)`
	`2368`	`+}`
`2367`	`2369`	`returnnil,xerrors.Errorf("no rows returned for version select")`
`2368`	`2370`	`}`
`2369`	`2371`	`varversionNumint`

Comments

(0)