From 1917b22e77104e2345116b3f5030a6f8a8f305e2 Mon Sep 17 00:00:00 2001 From: mkelvers Date: Sat, 20 Jun 2026 18:29:29 +0200 Subject: [PATCH] Return rollback errors --- internal/dbtx/tx.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/dbtx/tx.go b/internal/dbtx/tx.go index 2654ab5..c4cd332 100644 --- a/internal/dbtx/tx.go +++ b/internal/dbtx/tx.go @@ -3,6 +3,7 @@ package dbtx import ( "context" "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 { @@ -17,7 +18,9 @@ func Run[T any](ctx context.Context, sqlDB *sql.DB, repo T, withTx func(*sql.Tx) txRepo := withTx(tx) if err := fn(ctx, txRepo); err != nil { - _ = tx.Rollback() + if rollbackErr := tx.Rollback(); rollbackErr != nil { + return errors.Join(err, rollbackErr) + } return err }