codestyle + changelog

Author: Shabad Kirill

CHANGELOG.md

@@ -1,3 +1,6 @@
+## v3.115.1
+* Fixed error catching in DoTxWithResult
+
 ## v3.115.0
 * Added public package `pkg/xtest` with test helpers
 

retry/sql.go

@@ -222,14 +222,8 @@ func DoTxWithResult[T any](ctx context.Context, db *sql.DB,
 			return zeroValue, xerrors.WithStackTrace(err)
 		}
 		if err = tx.Commit(); err != nil {
-			// We create and use tx in this method, so if we catch this error
-			// it means context cancellation
-			if xerrors.Is(err, sql.ErrTxDone) {
-				if ctxErr := ctx.Err(); ctxErr != nil {
-					return zeroValue, xerrors.WithStackTrace(ctxErr)
-				}
-			}
-			return zeroValue, xerrors.WithStackTrace(err)
+			// We create and use tx in this method, so if we catch this error, it means context cancellation
+			return zeroValue, xerrors.WithStackTrace(transformCommitError(ctx, err))
 		}
 
 		return v, nil
@@ -243,6 +237,16 @@ func DoTxWithResult[T any](ctx context.Context, db *sql.DB,
 	return v, nil
 }
 
+func transformCommitError(ctx context.Context, err error) error {
+	if xerrors.Is(err, sql.ErrTxDone) {
+		if ctxErr := ctx.Err(); ctxErr != nil {
+			return ctxErr
+		}
+	}
+
+	return err
+}
+
 func mustDeleteConn[T interface {
 	*sql.Conn
 }](err error, conn T) bool {

retry/sql_test.go

@@ -310,6 +310,7 @@ func TestTxDoneErrorReturnsContextError(t *testing.T) {
 				attempts++
 				cancel()
 				time.Sleep(10 * time.Millisecond)
+
 				return 42, nil
 			},
 		)
@@ -334,6 +335,7 @@ func TestTxDoneErrorReturnsContextError(t *testing.T) {
 				attempts++
 				cancel()
 				time.Sleep(10 * time.Millisecond)
+
 				return nil
 			},
 		)