- 修复线程事务嵌套事务的 bug；#502

2025-06-19 20:38:16 +08:00 · 2020-10-26 21:08:10 +08:00
parent 1a05d63a96
commit 32353bb335
4 changed files with 189 additions and 10 deletions
--- a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderTransaction.cs
+++ b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProviderTransaction.cs
@ -112,15 +112,16 @@ namespace FreeSql.Internal.CommonProvider

        void TransactionInternal(IsolationLevel? isolationLevel, Action handler)
        {
+            var requireTran = TransactionCurrentThread == null;
            try
            {
-                BeginTransaction(isolationLevel);
+                if (requireTran) BeginTransaction(isolationLevel);
                handler();
-                CommitTransaction();
+                if (requireTran) CommitTransaction();
            }
            catch (Exception ex)
            {
-                RollbackTransaction(ex);
+                if (requireTran) RollbackTransaction(ex);
                throw ex;
            }
        }