Skip to content

Commit 2702bd1

Browse files
authored
Merge pull request #31 from c2h5oh/txsession
SessionTx is hiding errors by returning rollback result
2 parents 1c2483f + 54e47d9 commit 2702bd1

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

session.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package bond
33
import (
44
"context"
55
"database/sql"
6-
"errors"
76
"fmt"
87
"reflect"
98
"sync"
109

10+
"github.com/pkg/errors"
1111
"upper.io/db.v3"
1212
"upper.io/db.v3/lib/sqlbuilder"
1313
)
@@ -137,7 +137,10 @@ func (s *session) SessionTx(ctx context.Context, fn func(sess Session) error) er
137137
defer t.Close()
138138
err := txFn(t)
139139
if err != nil {
140-
return t.Rollback()
140+
if rErr := t.Rollback(); rErr != nil {
141+
return errors.Wrap(err, rErr.Error())
142+
}
143+
return err
141144
}
142145
return t.Commit()
143146
}

0 commit comments

Comments
 (0)