diff --git a/cli/server.go b/cli/server.go
index d9badd02d9fbf..0cc7b0edf2e36 100644
--- a/cli/server.go
+++ b/cli/server.go
@@ -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
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy