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

Handle SendBatch calls on closed transactions with null connections. This was previously panicking due to a null pointer exception as exposed in the provided unit test.

pull/975/head
Matt Schultz 2021-03-16 14:59:47 -05:00 committed by Jack Christensen
parent 495d482f20
commit a0028cbd0d
2 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
batch.go
View File

@ -70,10 +70,10 @@ func (br *batchResults) Exec() (pgconn.CommandTag, error) {
err = errors.New("no result") err = errors.New("no result")
} }
if br.conn.shouldLog(LogLevelError) { if br.conn.shouldLog(LogLevelError) {
br.conn.log(br.ctx, LogLevelError, "BatchResult.Exec", map[string]interface{} { br.conn.log(br.ctx, LogLevelError, "BatchResult.Exec", map[string]interface{}{
"sql": query, "sql": query,
"args": logQueryArgs(arguments), "args": logQueryArgs(arguments),
"err": err, "err": err,
}) })
} }
return nil, err return nil, err
@ -90,9 +90,9 @@ func (br *batchResults) Exec() (pgconn.CommandTag, error) {
}) })
} }
} else if br.conn.shouldLog(LogLevelInfo) { } else if br.conn.shouldLog(LogLevelInfo) {
br.conn.log(br.ctx, LogLevelInfo, "BatchResult.Exec", map[string]interface{} { br.conn.log(br.ctx, LogLevelInfo, "BatchResult.Exec", map[string]interface{}{
"sql": query, "sql": query,
"args": logQueryArgs(arguments), "args": logQueryArgs(arguments),
"commandTag": commandTag, "commandTag": commandTag,
}) })
} }
@ -107,14 +107,12 @@ func (br *batchResults) Query() (Rows, error) {
query = "batch query" query = "batch query"
} }
rows := br.conn.getRows(br.ctx, query, arguments)
if br.err != nil { if br.err != nil {
rows.err = br.err return &connRows{err: br.err, closed: true}, br.err
rows.closed = true
return rows, br.err
} }
rows := br.conn.getRows(br.ctx, query, arguments)
if !br.mrr.NextResult() { if !br.mrr.NextResult() {
rows.err = br.mrr.Close() rows.err = br.mrr.Close()
if rows.err == nil { if rows.err == nil {
@ -123,10 +121,10 @@ func (br *batchResults) Query() (Rows, error) {
rows.closed = true rows.closed = true
if br.conn.shouldLog(LogLevelError) { if br.conn.shouldLog(LogLevelError) {
br.conn.log(br.ctx, LogLevelError, "BatchResult.Query", map[string]interface{} { br.conn.log(br.ctx, LogLevelError, "BatchResult.Query", map[string]interface{}{
"sql": query, "sql": query,
"args": logQueryArgs(arguments), "args": logQueryArgs(arguments),
"err": rows.err, "err": rows.err,
}) })
} }
@ -159,8 +157,8 @@ func (br *batchResults) Close() error {
} }
if br.conn.shouldLog(LogLevelInfo) { if br.conn.shouldLog(LogLevelInfo) {
br.conn.log(br.ctx, LogLevelInfo, "BatchResult.Close", map[string]interface{} { br.conn.log(br.ctx, LogLevelInfo, "BatchResult.Close", map[string]interface{}{
"sql": query, "sql": query,
"args": logQueryArgs(args), "args": logQueryArgs(args),
}) })
} }

33
tx_test.go
View File

@ -586,3 +586,36 @@ func TestTxBeginFuncNestedTransactionRollback(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.EqualValues(t, 2, n) require.EqualValues(t, 2, n)
} }
func TestTxSendBatchClosed(t *testing.T) {
t.Parallel()
db := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE"))
defer closeConn(t, db)
tx, err := db.Begin(context.Background())
require.NoError(t, err)
defer tx.Rollback(context.Background())
err = tx.Commit(context.Background())
require.NoError(t, err)
batch := &pgx.Batch{}
batch.Queue("select 1")
batch.Queue("select 2")
batch.Queue("select 3")
br := tx.SendBatch(context.Background(), batch)
defer br.Close()
var n int
_, err = br.Exec()
require.Error(t, err)
err = br.QueryRow().Scan(&n)
require.Error(t, err)
_, err = br.Query()
require.Error(t, err)
}