- 增加 CreateUnitOfWork 从外部事务创建；

Author: 2881099

FreeSql.DbContext/Repository/Extensions/FreeSqlRepositoryExtensions.cs

@@ -1,5 +1,6 @@
 using FreeSql;
 using System;
+using System.Data.Common;
 using System.Linq;
 using System.Linq.Expressions;
 
@@ -26,4 +27,16 @@ public static IRepositoryUnitOfWork CreateUnitOfWork(this IFreeSql that)
     {
         return new RepositoryUnitOfWork(that);
     }
+
+    /// <summary>
+    /// 创建基于外部事务的工作单元
+    /// <para>注意：该工作单元 Commit/Dispose 时不会关闭传入的 transaction，请自行管理 transaction 生命周期</para>
+    /// </summary>
+    /// <param name="fsql"></param>
+    /// <param name="transaction">外部传入的 DbTransaction</param>
+    /// <returns></returns>
+    public static IUnitOfWork CreateUnitOfWork(this IFreeSql fsql, DbTransaction transaction)
+    {
+        return new ExternalUnitOfWork(fsql, transaction);
+    }
 }

FreeSql.DbContext/UnitOfWork/ExternalUnitOfWork.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Data.Common;
+using System.Linq;
+
+namespace FreeSql
+{
+    /// <summary>
+    /// 外部事务适配的工作单元
+    /// <para>用于适配第三方事务（如 EFCore、ADO.NET 原生事务）给 FreeSql 使用</para>
+    /// </summary>
+    public class ExternalUnitOfWork : UnitOfWork, IUnitOfWork
+    {
+        private readonly DbTransaction _externalTran;
+
+        public ExternalUnitOfWork(IFreeSql fsql, DbTransaction externalTran) : base(fsql)
+        {
+            if (externalTran == null) throw new ArgumentNullException(nameof(externalTran));
+            _externalTran = externalTran;
+            this._tran = externalTran;
+        }
+
+        #region IUnitOfWork 显式接口实现 (拦截基类行为)
+
+        DbTransaction IUnitOfWork.GetOrBeginTransaction(bool isCreate)
+        {
+            return _externalTran;
+        }
+
+        void IUnitOfWork.Commit()
+        {
+            try
+            {
+                _fsql?.Aop.TraceAfterHandler?.Invoke(this, new Aop.TraceAfterEventArgs(_tranBefore, "提交(外部)", null));
+
+                if (EntityChangeReport != null && EntityChangeReport.OnChange != null && EntityChangeReport.Report.Any())
+                    EntityChangeReport.OnChange.Invoke(EntityChangeReport.Report);
+            }
+            finally
+            {
+                EntityChangeReport?.Report.Clear();
+            }
+        }
+
+        void IUnitOfWork.Rollback()
+        {
+            try
+            {
+                _fsql?.Aop.TraceAfterHandler?.Invoke(this, new Aop.TraceAfterEventArgs(_tranBefore, "回滚(外部)", null));
+            }
+            finally
+            {
+                EntityChangeReport?.Report.Clear();
+            }
+        }
+
+        void IDisposable.Dispose()
+        {
+            // 不调用 _externalTran.Dispose()，因为生命周期归外部管理
+            EntityChangeReport?.Report.Clear();
+            GC.SuppressFinalize(this);
+        }
+
+        #endregion
+    }
+}