fixed: error handling in commit;
refactor: exposed untransactional queries for transactional db helper again but with a clearer name this time since it still may be useful
This commit is contained in:
@@ -18,7 +18,7 @@ type DbHelper struct {
|
||||
|
||||
type dbHelperTransactionImpl struct {
|
||||
CTX context.Context
|
||||
queries Queries
|
||||
TXlessQueries Queries
|
||||
TX pgx.Tx
|
||||
TXQueries Queries
|
||||
}
|
||||
@@ -48,7 +48,7 @@ func NewDbHelperTransaction(dbContext DbContext) (DbHelperTransaction, *dbHelper
|
||||
|
||||
obj := &dbHelperTransactionImpl{
|
||||
CTX: ctx,
|
||||
queries: *queries,
|
||||
TXlessQueries: *queries,
|
||||
TX: tx,
|
||||
TXQueries: *txQueries,
|
||||
}
|
||||
@@ -58,10 +58,16 @@ func NewDbHelperTransaction(dbContext DbContext) (DbHelperTransaction, *dbHelper
|
||||
|
||||
// Commit implements DbHelperTransaction.
|
||||
func (d *dbHelperTransactionImpl) Commit() error {
|
||||
err := d.TX.Commit(d.CTX)
|
||||
errCommit := d.TX.Commit(d.CTX)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
if errCommit != nil {
|
||||
errRollback := d.TX.Rollback(d.CTX)
|
||||
|
||||
if errRollback != nil {
|
||||
return errRollback
|
||||
}
|
||||
|
||||
return errCommit
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user