Skip to content

Commit eed5cbc

Browse files
author
yangyi
committed
refactor: 改进save point错误信息
1 parent 83aeac0 commit eed5cbc

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

helper.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ func SavePoint(ctx context.Context, tx Tx, name string, fn func() error) (err er
219219
}
220220

221221
if _, err := tx.ExecContext(ctx, fmt.Sprintf("SAVEPOINT %s", name)); err != nil {
222-
return fmt.Errorf("create savepoint, %w", err)
222+
return fmt.Errorf("create savepoint %s, %w", name, err)
223223
}
224224

225225
defer func() {
@@ -233,11 +233,13 @@ func SavePoint(ctx context.Context, tx Tx, name string, fn func() error) (err er
233233

234234
if err == nil {
235235
if _, errRelease := tx.ExecContext(ctx, fmt.Sprintf("RELEASE SAVEPOINT %s", name)); errRelease != nil {
236-
err = fmt.Errorf("release savepoint, %w", errRelease)
236+
err = fmt.Errorf("release savepoint %s, %w", name, errRelease)
237237
}
238238
} else {
239239
if _, errRollback := tx.ExecContext(ctx, fmt.Sprintf("ROLLBACK TO SAVEPOINT %s", name)); errRollback != nil {
240-
err = fmt.Errorf("rollback to savepoint, %v, caused by %w", errRollback, err)
240+
err = errors.Join(err,
241+
fmt.Errorf("rollback to savepoint %s, %w", name, errRollback),
242+
)
241243
}
242244
}
243245
}()

0 commit comments

Comments
 (0)