From be79f1c8f598cdc93eb77158fe631e96bc591b7d Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Fri, 31 Mar 2023 20:18:05 -0500 Subject: [PATCH] Allow batch callback function to override error https://github.com/jackc/pgx/pull/1538#issuecomment-1486083411 --- batch.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/batch.go b/batch.go index bb22c378..a61758a1 100644 --- a/batch.go +++ b/batch.go @@ -225,7 +225,7 @@ func (br *batchResults) Close() error { for br.err == nil && !br.closed && br.b != nil && br.qqIdx < len(br.b.queuedQueries) { if br.b.queuedQueries[br.qqIdx].fn != nil { err := br.b.queuedQueries[br.qqIdx].fn(br) - if err != nil && br.err == nil { + if err != nil { br.err = err } } else { @@ -398,7 +398,7 @@ func (br *pipelineBatchResults) Close() error { for br.err == nil && !br.closed && br.b != nil && br.qqIdx < len(br.b.queuedQueries) { if br.b.queuedQueries[br.qqIdx].fn != nil { err := br.b.queuedQueries[br.qqIdx].fn(br) - if err != nil && br.err == nil { + if err != nil { br.err = err } } else {