close db properly

hugodutka · hugodutka · commit e9f833b86470 · 2025-06-19T09:45:40.000Z
diff --git a/cli/server.go b/cli/server.go
@@ -2363,10 +2363,8 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d
 	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")
+		err = xerrors.Errorf("no rows returned for version select: %w", version.Err())
+		return nil, err
 	}
 	var versionNum int
 	err = version.Scan(&versionNum)
@@ -2375,7 +2373,8 @@ func ConnectToPostgres(ctx context.Context, logger slog.Logger, driver string, d
 	}
 
 	if versionNum < 130000 {
-		return nil, xerrors.Errorf("PostgreSQL version must be v13.0.0 or higher! Got: %d", versionNum)
+		err = xerrors.Errorf("PostgreSQL version must be v13.0.0 or higher! Got: %d", versionNum)
+		return nil, err
 	}
 	logger.Debug(ctx, "connected to postgresql", slog.F("version", versionNum))
 
