GOMODULES
/
pgx
mirror of https://github.com/jackc/pgx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make QueuedQuery.Fn property public, closes #1878 

This commit fixes the overlook of the #1886 where SQL and Arguments
properties were exposed
pull/2011/head
Pavlo Golub 2024-04-29 16:32:40 +02:00 committed by Jack Christensen
parent a966716860
commit 523411a3fb
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
batch.go
View File

@ -12,7 +12,7 @@ import (
type QueuedQuery struct { type QueuedQuery struct {
SQL string SQL string
Arguments []any Arguments []any
fn batchItemFunc Fn batchItemFunc
sd *pgconn.StatementDescription sd *pgconn.StatementDescription
} }
@ -20,7 +20,7 @@ type batchItemFunc func(br BatchResults) error
// Query sets fn to be called when the response to qq is received. // Query sets fn to be called when the response to qq is received.
func (qq *QueuedQuery) Query(fn func(rows Rows) error) { func (qq *QueuedQuery) Query(fn func(rows Rows) error) {
qq.fn = func(br BatchResults) error { qq.Fn = func(br BatchResults) error {
rows, _ := br.Query() rows, _ := br.Query()
defer rows.Close() defer rows.Close()
@ -36,7 +36,7 @@ func (qq *QueuedQuery) Query(fn func(rows Rows) error) {
// Query sets fn to be called when the response to qq is received. // Query sets fn to be called when the response to qq is received.
func (qq *QueuedQuery) QueryRow(fn func(row Row) error) { func (qq *QueuedQuery) QueryRow(fn func(row Row) error) {
qq.fn = func(br BatchResults) error { qq.Fn = func(br BatchResults) error {
row := br.QueryRow() row := br.QueryRow()
return fn(row) return fn(row)
} }
@ -44,7 +44,7 @@ func (qq *QueuedQuery) QueryRow(fn func(row Row) error) {
// Exec sets fn to be called when the response to qq is received. // Exec sets fn to be called when the response to qq is received.
func (qq *QueuedQuery) Exec(fn func(ct pgconn.CommandTag) error) { func (qq *QueuedQuery) Exec(fn func(ct pgconn.CommandTag) error) {
qq.fn = func(br BatchResults) error { qq.Fn = func(br BatchResults) error {
ct, err := br.Exec() ct, err := br.Exec()
if err != nil { if err != nil {
return err return err
@ -228,8 +228,8 @@ func (br *batchResults) Close() error {
// Read and run fn for all remaining items // Read and run fn for all remaining items
for br.err == nil && !br.closed && br.b != nil && br.qqIdx < len(br.b.QueuedQueries) { for br.err == nil && !br.closed && br.b != nil && br.qqIdx < len(br.b.QueuedQueries) {
if br.b.QueuedQueries[br.qqIdx].fn != nil { if br.b.QueuedQueries[br.qqIdx].Fn != nil {
err := br.b.QueuedQueries[br.qqIdx].fn(br) err := br.b.QueuedQueries[br.qqIdx].Fn(br)
if err != nil { if err != nil {
br.err = err br.err = err
} }
@ -397,8 +397,8 @@ func (br *pipelineBatchResults) Close() error {
// Read and run fn for all remaining items // Read and run fn for all remaining items
for br.err == nil && !br.closed && br.b != nil && br.qqIdx < len(br.b.QueuedQueries) { for br.err == nil && !br.closed && br.b != nil && br.qqIdx < len(br.b.QueuedQueries) {
if br.b.QueuedQueries[br.qqIdx].fn != nil { if br.b.QueuedQueries[br.qqIdx].Fn != nil {
err := br.b.QueuedQueries[br.qqIdx].fn(br) err := br.b.QueuedQueries[br.qqIdx].Fn(br)
if err != nil { if err != nil {
br.err = err br.err = err
} }