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

Merge pull request #706 from georgysavva/wrapTx-context 

add context to `stdlib.wrapTx{}`
pull/709/head
Jack Christensen 2020-04-02 08:19:05 -05:00 committed by GitHub
parent 9188e32737 7738775417
commit 43c2113f90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
stdlib/sql.go
View File

@ -266,7 +266,7 @@ func (c *Conn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, e
return nil, err return nil, err
} }
return wrapTx{tx: tx}, nil return wrapTx{ctx: ctx, tx: tx}, nil
} }
func (c *Conn) ExecContext(ctx context.Context, query string, argsV []driver.NamedValue) (driver.Result, error) { func (c *Conn) ExecContext(ctx context.Context, query string, argsV []driver.NamedValue) (driver.Result, error) {
@ -539,11 +539,14 @@ func namedValueToInterface(argsV []driver.NamedValue) []interface{} {
return args return args
} }
type wrapTx struct{ tx pgx.Tx } type wrapTx struct {
ctx context.Context
tx pgx.Tx
}
func (wtx wrapTx) Commit() error { return wtx.tx.Commit(context.Background()) } func (wtx wrapTx) Commit() error { return wtx.tx.Commit(wtx.ctx) }
func (wtx wrapTx) Rollback() error { return wtx.tx.Rollback(context.Background()) } func (wtx wrapTx) Rollback() error { return wtx.tx.Rollback(wtx.ctx) }
type fakeTx struct{} type fakeTx struct{}