From 550fcbf14fb67984c953e5045e901560e9a3ea61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?=
 <47069183+mike-sb@users.noreply.github.com>
Date: Fri, 28 Aug 2026 15:07:08 +0300
Subject: [PATCH] Replace error messages with predefined variables

---
 batch.go | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/batch.go b/batch.go
index 805cc39ef..3237b22c2 100644
--- a/batch.go
+++ b/batch.go
@@ -8,6 +8,10 @@ import (
 	"github.com/jackc/pgx/v5/pgconn"
 )
 
+var ErrBatchClosed = errors.New("batch already closed")
+var ErrBatchEmpty = errors.New("no more results in batch")
+var ErrBatchReference = errors.New("no reference to batch")
+
 // QueuedQuery is a query that has been queued for execution via a [Batch].
 type QueuedQuery struct {
 	SQL       string
@@ -132,7 +136,7 @@ func (br *batchResults) Exec() (pgconn.CommandTag, error) {
 		return pgconn.CommandTag{}, br.err
 	}
 	if br.closed {
-		return pgconn.CommandTag{}, fmt.Errorf("batch already closed")
+		return pgconn.CommandTag{}, ErrBatchClosed
 	}
 
 	query, arguments, _ := br.nextQueryAndArgs()
@@ -140,7 +144,7 @@ func (br *batchResults) Exec() (pgconn.CommandTag, error) {
 	if !br.mrr.NextResult() {
 		err := br.mrr.Close()
 		if err == nil {
-			err = errors.New("no more results in batch")
+			err = ErrBatchEmpty
 		}
 		if br.conn.batchTracer != nil {
 			br.conn.batchTracer.TraceBatchQuery(br.ctx, br.conn, TraceBatchQueryData{
@@ -182,8 +186,7 @@ func (br *batchResults) Query() (Rows, error) {
 	}
 
 	if br.closed {
-		alreadyClosedErr := fmt.Errorf("batch already closed")
-		return &baseRows{err: alreadyClosedErr, closed: true}, alreadyClosedErr
+		return &baseRows{err: ErrBatchClosed, closed: true}, ErrBatchClosed
 	}
 
 	rows := br.conn.getRows(br.ctx, query, arguments)
@@ -192,7 +195,7 @@ func (br *batchResults) Query() (Rows, error) {
 	if !br.mrr.NextResult() {
 		rows.err = br.mrr.Close()
 		if rows.err == nil {
-			rows.err = errors.New("no more results in batch")
+			rows.err = ErrBatchEmpty
 		}
 		rows.closed = true
 
@@ -294,7 +297,7 @@ func (br *pipelineBatchResults) Exec() (pgconn.CommandTag, error) {
 		return pgconn.CommandTag{}, br.err
 	}
 	if br.closed {
-		return pgconn.CommandTag{}, fmt.Errorf("batch already closed")
+		return pgconn.CommandTag{}, ErrBatchClosed
 	}
 	if br.lastRows != nil && br.lastRows.err != nil {
 		br.err = br.lastRows.err
@@ -338,8 +341,7 @@ func (br *pipelineBatchResults) Query() (Rows, error) {
 	}
 
 	if br.closed {
-		alreadyClosedErr := fmt.Errorf("batch already closed")
-		return &baseRows{err: alreadyClosedErr, closed: true}, alreadyClosedErr
+		return &baseRows{err: ErrBatchClosed, closed: true}, ErrBatchClosed
 	}
 
 	if br.lastRows != nil && br.lastRows.err != nil {
@@ -440,11 +442,11 @@ func (br *pipelineBatchResults) earlyError() error {
 
 func (br *pipelineBatchResults) nextQueryAndArgs() (query string, args []any, err error) {
 	if br.b == nil {
-		return "", nil, errors.New("no reference to batch")
+		return "", nil, ErrBatchReference
 	}
 
 	if br.qqIdx >= len(br.b.QueuedQueries) {
-		return "", nil, errors.New("no more results in batch")
+		return "", nil, ErrBatchEmpty
 	}
 
 	bi := br.b.QueuedQueries[br.qqIdx]
@@ -460,20 +462,19 @@ type emptyBatchResults struct {
 // Exec reads the results from the next query in the batch as if the query has been sent with Exec.
 func (br *emptyBatchResults) Exec() (pgconn.CommandTag, error) {
 	if br.closed {
-		return pgconn.CommandTag{}, fmt.Errorf("batch already closed")
+		return pgconn.CommandTag{}, ErrBatchClosed
 	}
-	return pgconn.CommandTag{}, errors.New("no more results in batch")
+	return pgconn.CommandTag{}, ErrBatchEmpty
 }
 
 // Query reads the results from the next query in the batch as if the query has been sent with Query.
 func (br *emptyBatchResults) Query() (Rows, error) {
 	if br.closed {
-		alreadyClosedErr := fmt.Errorf("batch already closed")
-		return &baseRows{err: alreadyClosedErr, closed: true}, alreadyClosedErr
+		return &baseRows{err: ErrBatchClosed, closed: true}, ErrBatchClosed
 	}
 
 	rows := br.conn.getRows(context.Background(), "", nil)
-	rows.err = errors.New("no more results in batch")
+	rows.err = ErrBatchEmpty
 	rows.closed = true
 	return rows, rows.err
 }