Return rollback errors
This commit is contained in:
@@ -3,6 +3,7 @@ package dbtx
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"database/sql"
|
"database/sql"
|
||||||
|
"errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Run[T any](ctx context.Context, sqlDB *sql.DB, repo T, withTx func(*sql.Tx) T, fn func(context.Context, T) error) error {
|
func Run[T any](ctx context.Context, sqlDB *sql.DB, repo T, withTx func(*sql.Tx) T, fn func(context.Context, T) error) error {
|
||||||
@@ -17,7 +18,9 @@ func Run[T any](ctx context.Context, sqlDB *sql.DB, repo T, withTx func(*sql.Tx)
|
|||||||
|
|
||||||
txRepo := withTx(tx)
|
txRepo := withTx(tx)
|
||||||
if err := fn(ctx, txRepo); err != nil {
|
if err := fn(ctx, txRepo); err != nil {
|
||||||
_ = tx.Rollback()
|
if rollbackErr := tx.Rollback(); rollbackErr != nil {
|
||||||
|
return errors.Join(err, rollbackErr)
|
||||||
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user