chore: improve rows.Err linter check

miparnisari · miparnisari · commit 931af3de4c9a · 2025-09-11T13:25:24.000-07:00
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -48,8 +48,7 @@ linters:
           disabled: true
     rowserrcheck:
       packages:
-        - "github.com/jmoiron/sqlx"
-        - "github.com/jackc/pgx"
+        - "github.com/jackc/pgx/v5"
   exclusions:
     generated: "lax"
     presets:
diff --git a/internal/datastore/crdb/pool/pool.go b/internal/datastore/crdb/pool/pool.go
@@ -172,7 +172,11 @@ func (p *RetryPool) QueryFunc(ctx context.Context, rowsFunc func(ctx context.Con
 			return err
 		}
 		defer rows.Close()
-		return rowsFunc(ctx, rows)
+		err = rowsFunc(ctx, rows)
+		if err != nil {
+			return err
+		}
+		return rows.Err()
 	})
 }
 
diff --git a/internal/datastore/postgres/common/interceptor.go b/internal/datastore/postgres/common/interceptor.go
@@ -59,7 +59,7 @@ func (q querierInterceptor) Exec(ctx context.Context, sql string, arguments ...a
 }
 
 func (q querierInterceptor) Query(ctx context.Context, sql string, arguments ...any) (pgx.Rows, error) {
-	return q.interceptor.InterceptQuery(ctx, q.delegate, sql, arguments...)
+	return q.interceptor.InterceptQuery(ctx, q.delegate, sql, arguments...) // nolint:rowserrcheck
 }
 
 func (q querierInterceptor) QueryRow(ctx context.Context, sql string, arguments ...any) pgx.Row {
@@ -119,7 +119,7 @@ func (t txInterceptor) Exec(ctx context.Context, sql string, args ...any) (comma
 }
 
 func (t txInterceptor) Query(ctx context.Context, sql string, args ...any) (pgx.Rows, error) {
-	return t.interceptor.InterceptQuery(ctx, t.delegate, sql, args...)
+	return t.interceptor.InterceptQuery(ctx, t.delegate, sql, args...) // nolint:rowserrcheck
 }
 
 func (t txInterceptor) QueryRow(ctx context.Context, sql string, args ...any) pgx.Row {
@@ -155,7 +155,7 @@ func (i InterceptorPooler) Exec(ctx context.Context, sql string, arguments ...an
 }
 
 func (i InterceptorPooler) Query(ctx context.Context, sql string, optionsAndArgs ...any) (pgx.Rows, error) {
-	return i.interceptingQuerier.Query(ctx, sql, optionsAndArgs...)
+	return i.interceptingQuerier.Query(ctx, sql, optionsAndArgs...) // nolint:rowserrcheck
 }
 
 func (i InterceptorPooler) QueryRow(ctx context.Context, sql string, optionsAndArgs ...any) pgx.Row {
diff --git a/internal/datastore/postgres/common/pgx.go b/internal/datastore/postgres/common/pgx.go
@@ -278,7 +278,11 @@ func (t *QuerierFuncs) QueryFunc(ctx context.Context, rowsFunc func(ctx context.
 		return err
 	}
 	defer rows.Close()
-	return rowsFunc(ctx, rows)
+	err = rowsFunc(ctx, rows)
+	if err != nil {
+		return err
+	}
+	return rows.Err()
 }
 
 func (t *QuerierFuncs) QueryRowFunc(ctx context.Context, rowFunc func(ctx context.Context, row pgx.Row) error, sql string, optionsAndArgs ...any) error {
diff --git a/tools/analyzers/iferrafterrowclosecheck/iferrafterrowclosecheck.go b/tools/analyzers/iferrafterrowclosecheck/iferrafterrowclosecheck.go
@@ -3,7 +3,6 @@ package iferrafterrowclosecheck
 import (
 	"flag"
 	"go/ast"
-	"slices"
 	"strings"
 
 	"github.com/samber/lo"
@@ -12,11 +11,6 @@ import (
 	"golang.org/x/tools/go/ast/inspector"
 )
 
-type nodeAndStack struct {
-	node  ast.Node
-	stack []ast.Node
-}
-
 func Analyzer() *analysis.Analyzer {
 	flagSet := flag.NewFlagSet("iferrafterrowclosecheck", flag.ExitOnError)
 	skip := flagSet.String("skip-pkg", "", "package(s) to skip for linting")
@@ -129,40 +123,3 @@ func hasImmediateErrorCheck(closeStmt *ast.ExprStmt, rowsName string, stack []as
 
 	return false
 }
-
-func isStatementRightAfter(first nodeAndStack, second nodeAndStack) bool {
-	containingStatement, firstIndex, secondIndex := findSharedContainingStatement(
-		append(slices.Clone(first.stack), first.node),
-		append(slices.Clone(second.stack), second.node),
-	)
-
-	if containingStatement == nil {
-		return false
-	}
-
-	return secondIndex == firstIndex+1
-}
-
-func findSharedContainingStatement(first []ast.Node, second []ast.Node) (ast.Node, int, int) {
-	for i := 0; i < min(len(first), len(second)); i++ {
-		if i > 0 && first[i] != second[i] {
-			for j := i - 1; j >= 0; j-- {
-				if block, ok := first[j].(*ast.BlockStmt); ok {
-					return block, stIndex(block.List, first[j+1]), stIndex(block.List, second[j+1])
-				}
-
-				if cse, ok := first[j].(*ast.CaseClause); ok {
-					return cse, stIndex(cse.Body, first[j+1]), stIndex(cse.Body, second[j+1])
-				}
-			}
-		}
-	}
-
-	return nil, -1, -1
-}
-
-func stIndex(statements []ast.Stmt, node ast.Node) int {
-	return slices.IndexFunc(statements, func(current ast.Stmt) bool {
-		return current == node
-	})
-}

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,11 @@ func (p *RetryPool) QueryFunc(ctx context.Context, rowsFunc func(ctx context.Con`
`172`	`172`	`return err`
`173`	`173`	`}`
`174`	`174`	`defer rows.Close()`
`175`		`- return rowsFunc(ctx, rows)`
	`175`	`+ err = rowsFunc(ctx, rows)`
	`176`	`+ if err != nil {`
	`177`	`+ return err`
	`178`	`+ }`
	`179`	`+ return rows.Err()`
`176`	`180`	`})`
`177`	`181`	`}`
`178`	`182`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func (q querierInterceptor) Exec(ctx context.Context, sql string, arguments ...a`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`func (q querierInterceptor) Query(ctx context.Context, sql string, arguments ...any) (pgx.Rows, error) {`
`62`		`- return q.interceptor.InterceptQuery(ctx, q.delegate, sql, arguments...)`
	`62`	`+ return q.interceptor.InterceptQuery(ctx, q.delegate, sql, arguments...) // nolint:rowserrcheck`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`func (q querierInterceptor) QueryRow(ctx context.Context, sql string, arguments ...any) pgx.Row {`
`@@ -119,7 +119,7 @@ func (t txInterceptor) Exec(ctx context.Context, sql string, args ...any) (comma`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`func (t txInterceptor) Query(ctx context.Context, sql string, args ...any) (pgx.Rows, error) {`
`122`		`- return t.interceptor.InterceptQuery(ctx, t.delegate, sql, args...)`
	`122`	`+ return t.interceptor.InterceptQuery(ctx, t.delegate, sql, args...) // nolint:rowserrcheck`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`func (t txInterceptor) QueryRow(ctx context.Context, sql string, args ...any) pgx.Row {`
`@@ -155,7 +155,7 @@ func (i InterceptorPooler) Exec(ctx context.Context, sql string, arguments ...an`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`func (i InterceptorPooler) Query(ctx context.Context, sql string, optionsAndArgs ...any) (pgx.Rows, error) {`
`158`		`- return i.interceptingQuerier.Query(ctx, sql, optionsAndArgs...)`
	`158`	`+ return i.interceptingQuerier.Query(ctx, sql, optionsAndArgs...) // nolint:rowserrcheck`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`func (i InterceptorPooler) QueryRow(ctx context.Context, sql string, optionsAndArgs ...any) pgx.Row {`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,11 @@ func (t *QuerierFuncs) QueryFunc(ctx context.Context, rowsFunc func(ctx context.`
`278`	`278`	`return err`
`279`	`279`	`}`
`280`	`280`	`defer rows.Close()`
`281`		`- return rowsFunc(ctx, rows)`
	`281`	`+ err = rowsFunc(ctx, rows)`
	`282`	`+ if err != nil {`
	`283`	`+ return err`
	`284`	`+ }`
	`285`	`+ return rows.Err()`
`282`	`286`	`}`
`283`	`287`
`284`	`288`	`func (t *QuerierFuncs) QueryRowFunc(ctx context.Context, rowFunc func(ctx context.Context, row pgx.Row) error, sql string, optionsAndArgs ...any) error {`