Merge branch 'pr-2565-review'

Author: jackc

.golangci.yml

@@ -7,6 +7,7 @@ linters:
     - govet
     - ineffassign
     - unconvert
+    - gocritic
 
 # See: https://golangci-lint.run/usage/formatters/
 formatters:

conn.go

@@ -808,7 +808,8 @@ optionLoop:
 
 	var err error
 	sd, explicitPreparedStatement := c.preparedStatements[sql]
-	if sd != nil || mode == QueryExecModeCacheStatement || mode == QueryExecModeCacheDescribe || mode == QueryExecModeDescribeExec {
+	switch {
+	case sd != nil || mode == QueryExecModeCacheStatement || mode == QueryExecModeCacheDescribe || mode == QueryExecModeDescribeExec:
 		if sd == nil {
 			sd, err = c.getStatementDescription(ctx, mode, sql)
 			if err != nil {
@@ -846,15 +847,15 @@ optionLoop:
 		} else {
 			rows.resultReader = c.pgConn.ExecStatement(ctx, sd, c.eqb.ParamValues, c.eqb.ParamFormats, resultFormats)
 		}
-	} else if mode == QueryExecModeExec {
+	case mode == QueryExecModeExec:
 		err := c.eqb.Build(c.typeMap, nil, args)
 		if err != nil {
 			rows.fatal(err)
 			return rows, rows.err
 		}
 
 		rows.resultReader = c.pgConn.ExecParams(ctx, sql, c.eqb.ParamValues, nil, c.eqb.ParamFormats, c.eqb.ResultFormats)
-	} else if mode == QueryExecModeSimpleProtocol {
+	case mode == QueryExecModeSimpleProtocol:
 		sql, err = c.sanitizeForSimpleQuery(sql, args...)
 		if err != nil {
 			rows.fatal(err)
@@ -872,7 +873,7 @@ optionLoop:
 		}
 
 		return rows, nil
-	} else {
+	default:
 		err = fmt.Errorf("unknown QueryExecMode: %v", mode)
 		rows.fatal(err)
 		return rows, rows.err

examples/chat/main.go

@@ -19,7 +19,12 @@ func main() {
 		os.Exit(1)
 	}
 
-	go listen()
+	go func() {
+		if err := listen(); err != nil {
+			fmt.Fprintln(os.Stderr, err)
+			os.Exit(1)
+		}
+	}()
 
 	fmt.Println(`Type a message and press enter.
 
@@ -47,25 +52,22 @@ Type "exit" to quit.`)
 	}
 }
 
-func listen() {
+func listen() error {
 	conn, err := pool.Acquire(context.Background())
 	if err != nil {
-		fmt.Fprintln(os.Stderr, "Error acquiring connection:", err)
-		os.Exit(1)
+		return fmt.Errorf("acquiring connection: %w", err)
 	}
 	defer conn.Release()
 
 	_, err = conn.Exec(context.Background(), "listen chat")
 	if err != nil {
-		fmt.Fprintln(os.Stderr, "Error listening to chat channel:", err)
-		os.Exit(1)
+		return fmt.Errorf("listening to chat channel: %w", err)
 	}
 
 	for {
 		notification, err := conn.Conn().WaitForNotification(context.Background())
 		if err != nil {
-			fmt.Fprintln(os.Stderr, "Error waiting for notification:", err)
-			os.Exit(1)
+			return fmt.Errorf("waiting for notification: %w", err)
 		}
 
 		fmt.Println("PID:", notification.PID, "Channel:", notification.Channel, "Payload:", notification.Payload)

mise.toml

@@ -1,5 +1,6 @@
 [tools]
 go = '1.26.3'
+"go:github.com/go-critic/go-critic/cmd/gocritic" = "latest"
 "go:github.com/gordonklaus/ineffassign" = "latest"
 "go:github.com/mdempsky/unconvert" = "latest"
 "go:golang.org/x/tools/cmd/goimports" = "latest"

pgconn/auth_scram.go

@@ -229,11 +229,12 @@ func (sc *scramClient) clientFirstMessage() []byte {
 
 	sc.clientFirstMessageBare = fmt.Appendf(nil, "n=,r=%s", sc.clientNonce)
 
-	if sc.authMechanism == scramSHA256PlusName {
+	switch {
+	case sc.authMechanism == scramSHA256PlusName:
 		sc.clientGS2Header = []byte("p=tls-server-end-point,,")
-	} else if sc.hasTLS {
+	case sc.hasTLS:
 		sc.clientGS2Header = []byte("y,,")
-	} else {
+	default:
 		sc.clientGS2Header = []byte("n,,")
 	}
 

pgconn/config.go

@@ -7,7 +7,6 @@ import (
 	"encoding/pem"
 	"errors"
 	"fmt"
-	"io"
 	"maps"
 	"math"
 	"net"
@@ -308,9 +307,7 @@ func ParseConfigWithOptions(connString string, options ParseConfigOptions) (*Con
 		User:                 settings["user"],
 		Password:             settings["password"],
 		RuntimeParams:        make(map[string]string),
-		BuildFrontend: func(r io.Reader, w io.Writer) *pgproto3.Frontend {
-			return pgproto3.NewFrontend(r, w)
-		},
+		BuildFrontend:        pgproto3.NewFrontend,
 		BuildContextWatcherHandler: func(pgConn *PgConn) ctxwatch.Handler {
 			return &DeadlineContextWatcherHandler{Conn: pgConn.conn}
 		},
@@ -643,8 +640,9 @@ func parseKeywordValueSettings(s string) (map[string]string, error) {
 
 		key = strings.Trim(s[:eqIdx], " \t\n\r\v\f")
 		s = strings.TrimLeft(s[eqIdx+1:], " \t\n\r\v\f")
-		if len(s) == 0 {
-		} else if s[0] != '\'' {
+		switch {
+		case len(s) == 0:
+		case s[0] != '\'':
 			end := 0
 			for ; end < len(s); end++ {
 				if asciiSpace[s[end]] == 1 {
@@ -657,11 +655,11 @@ func parseKeywordValueSettings(s string) (map[string]string, error) {
 					}
 				}
 			}
-			val = strings.Replace(strings.Replace(s[:end], "\\\\", "\\", -1), "\\'", "'", -1)
+			val = strings.ReplaceAll(strings.ReplaceAll(s[:end], "\\\\", "\\"), "\\'", "'")
 			// Consume the value and trim any subsequent whitespace so that
 			// multiple trailing spaces don't cause a spurious parse failure.
 			s = strings.TrimLeft(s[end:], " \t\n\r\v\f")
-		} else { // quoted string
+		default: // quoted string
 			s = s[1:]
 			end := 0
 			for ; end < len(s); end++ {
@@ -675,7 +673,7 @@ func parseKeywordValueSettings(s string) (map[string]string, error) {
 			if end == len(s) {
 				return nil, errors.New("unterminated quoted string in connection info string")
 			}
-			val = strings.Replace(strings.Replace(s[:end], "\\\\", "\\", -1), "\\'", "'", -1)
+			val = strings.ReplaceAll(strings.ReplaceAll(s[:end], "\\\\", "\\"), "\\'", "'")
 			// Consume the closing quote and any subsequent whitespace.
 			s = strings.TrimLeft(s[end+1:], " \t\n\r\v\f")
 		}

pgconn/errors.go

@@ -151,12 +151,13 @@ func (e *ParseConfigError) Unwrap() error {
 func normalizeTimeoutError(ctx context.Context, err error) error {
 	var netErr net.Error
 	if errors.As(err, &netErr) && netErr.Timeout() {
-		if ctx.Err() == context.Canceled {
+		switch ctx.Err() {
+		case context.Canceled:
 			// Since the timeout was caused by a context cancellation, the actual error is context.Canceled not the timeout error.
 			return context.Canceled
-		} else if ctx.Err() == context.DeadlineExceeded {
+		case context.DeadlineExceeded:
 			return &errTimeout{err: ctx.Err()}
-		} else {
+		default:
 			return &errTimeout{err: err}
 		}
 	}

pgconn/pgconn.go

@@ -1125,8 +1125,7 @@ func (pgConn *PgConn) WaitForNotification(ctx context.Context) error {
 			return normalizeTimeoutError(ctx, err)
 		}
 
-		switch msg.(type) {
-		case *pgproto3.NotificationResponse:
+		if _, ok := msg.(*pgproto3.NotificationResponse); ok {
 			return nil
 		}
 	}
@@ -1711,8 +1710,7 @@ func (rr *ResultReader) NextRow() bool {
 			return false
 		}
 
-		switch msg := msg.(type) {
-		case *pgproto3.DataRow:
+		if msg, ok := msg.(*pgproto3.DataRow); ok {
 			rr.rowValues = msg.Values
 			return true
 		}
@@ -2009,7 +2007,7 @@ func (pgConn *PgConn) EscapeString(s string) (string, error) {
 		return "", errors.New("EscapeString must be run with client_encoding=UTF8")
 	}
 
-	return strings.Replace(s, "'", "''", -1), nil
+	return strings.ReplaceAll(s, "'", "''"), nil
 }
 
 // CheckConn checks the underlying connection without writing any bytes. This is currently implemented by doing a read

pgconn/pgconn_test.go

@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"log"
 	"math"
 	"net"
 	"os"
@@ -4141,13 +4140,15 @@ func Example() {
 
 	pgConn, err := pgconn.Connect(ctx, os.Getenv("PGX_TEST_DATABASE"))
 	if err != nil {
-		log.Fatalln(err)
+		fmt.Fprintln(os.Stderr, err)
+		return
 	}
 	defer pgConn.Close(ctx)
 
 	result := pgConn.ExecParams(ctx, "select generate_series(1,3)", nil, nil, nil, nil).Read()
 	if result.Err != nil {
-		log.Fatalln(result.Err)
+		fmt.Fprintln(os.Stderr, result.Err)
+		return
 	}
 
 	for _, row := range result.Rows {

pgproto3/function_call.go

@@ -66,11 +66,12 @@ func (dst *FunctionCall) Decode(src []byte) error {
 		// As a special case, -1 indicates a NULL argument value. No value bytes follow in the NULL case.
 		argumentLength := int(int32(binary.BigEndian.Uint32(src[rp:])))
 		rp += 4
-		if argumentLength == -1 {
+		switch {
+		case argumentLength == -1:
 			arguments[i] = nil
-		} else if argumentLength < 0 {
+		case argumentLength < 0:
 			return &invalidMessageFormatErr{messageType: "FunctionCall"}
-		} else {
+		default:
 			if len(src[rp:]) < argumentLength {
 				return &invalidMessageFormatErr{messageType: "FunctionCall"}
 			}