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

Made error check conditions clearer

pull/1058/head
Don2Quixote 2021-08-07 23:07:42 +03:00 committed by Jack Christensen
parent 8f33ed07cd
commit 23b4656fc5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tx.go
View File

@ -109,7 +109,7 @@ func (c *Conn) BeginTxFunc(ctx context.Context, txOptions TxOptions, f func(Tx)
} }
defer func() { defer func() {
rollbackErr := tx.Rollback(ctx) rollbackErr := tx.Rollback(ctx)
if !(rollbackErr == nil || errors.Is(rollbackErr, ErrTxClosed)) { if rollbackErr != nil && !errors.Is(rollbackErr, ErrTxClosed) {
err = rollbackErr err = rollbackErr
} }
}() }()
@ -203,7 +203,7 @@ func (tx *dbTx) BeginFunc(ctx context.Context, f func(Tx) error) (err error) {
} }
defer func() { defer func() {
rollbackErr := savepoint.Rollback(ctx) rollbackErr := savepoint.Rollback(ctx)
if !(rollbackErr == nil || errors.Is(rollbackErr, ErrTxClosed)) { if rollbackErr != nil && !errors.Is(rollbackErr, ErrTxClosed) {
err = rollbackErr err = rollbackErr
} }
}() }()