pgx batch uses SendQueryStatement

jackc · jackc · commit c3a17505ff2d · 2026-01-31T15:48:05.000Z
diff --git a/batch_test.go b/batch_test.go
@@ -1043,15 +1043,12 @@ func TestSendBatchStatementTimeout(t *testing.T) {
 		assert.NoError(t, err)
 
 		// get pg_sleep results
-		rows, err := br.Query()
-		assert.NoError(t, err)
+		rows, _ := br.Query()
 
 		// Consume rows and check error
-		for rows.Next() {
-		}
+		rows.Close()
 		err = rows.Err()
 		assert.ErrorContains(t, err, "(SQLSTATE 57014)")
-		rows.Close()
 
 		// The last error should be repeated when closing the batch
 		err = br.Close()
@@ -1161,8 +1158,8 @@ func TestBatchNetworkUsage(t *testing.T) {
 	err := conn.SendBatch(context.Background(), batch).Close()
 	require.NoError(t, err)
 
-	assert.Equal(t, 4116, counterConn.bytesRead)
-	assert.Equal(t, 1478, counterConn.bytesWritten)
+	assert.Equal(t, 1736, counterConn.bytesRead)
+	assert.Equal(t, 1408, counterConn.bytesWritten)
 
 	ensureConnValid(t, conn)
 }
diff --git a/conn.go b/conn.go
@@ -1236,7 +1236,7 @@ func (c *Conn) sendBatchExtendedWithDescription(ctx context.Context, b *Batch, d
 		if bi.sd.Name == "" {
 			pipeline.SendQueryParams(bi.sd.SQL, c.eqb.ParamValues, bi.sd.ParamOIDs, c.eqb.ParamFormats, c.eqb.ResultFormats)
 		} else {
-			pipeline.SendQueryPrepared(bi.sd.Name, c.eqb.ParamValues, c.eqb.ParamFormats, c.eqb.ResultFormats)
+			pipeline.SendQueryStatement(bi.sd, c.eqb.ParamValues, c.eqb.ParamFormats, c.eqb.ResultFormats)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1236,7 +1236,7 @@ func (c Conn) sendBatchExtendedWithDescription(ctx context.Context, b Batch, d`
`1236`	`1236`	`if bi.sd.Name == "" {`
`1237`	`1237`	`pipeline.SendQueryParams(bi.sd.SQL, c.eqb.ParamValues, bi.sd.ParamOIDs, c.eqb.ParamFormats, c.eqb.ResultFormats)`
`1238`	`1238`	`} else {`
`1239`		`- pipeline.SendQueryPrepared(bi.sd.Name, c.eqb.ParamValues, c.eqb.ParamFormats, c.eqb.ResultFormats)`
	`1239`	`+ pipeline.SendQueryStatement(bi.sd, c.eqb.ParamValues, c.eqb.ParamFormats, c.eqb.ResultFormats)`
`1240`	`1240`	`}`
`1241`	`1241`	`}`
`1242`	`1242`