Merge pull request #1 from stulzq/master

添加工作单元手动关闭

Author: 2881099

FreeSql.DbContext.Tests/RepositoryTests.cs

@@ -75,7 +75,7 @@ public class AddUpdateInfo {
 
 		[Fact]
 		public void UnitOfWorkRepository() {
-			foreach (var fsql in new[] { g.sqlite, /*g.mysql,*/ g.pgsql, g.oracle, g.sqlserver }) {
+			foreach (var fsql in new[] { g.sqlite, /*g.mysql, g.pgsql, g.oracle, g.sqlserver*/ }) {
 
 				fsql.CodeFirst.ConfigEntity<FlowModel>(f => {
 					f.Property(b => b.UserId).IsPrimary(true);
@@ -104,9 +104,130 @@ public void UnitOfWorkRepository() {
 					flowRepos.Insert(flow);
 					uow.Commit();
 				}
-			}
+            }
 		}
-		public partial class FlowModel {
+
+        [Fact]
+        public void UnitOfWorkRepositoryWithDisableBeforeInsert()
+        {
+            foreach (var fsql in new[] { g.sqlite,  })
+            {
+                fsql.CodeFirst.ConfigEntity<FlowModel>(f => {
+                    f.Property(b => b.UserId).IsPrimary(true);
+                    f.Property(b => b.Id).IsPrimary(true).IsIdentity(true);
+                    f.Property(b => b.Name).IsNullable(false);
+                });
+
+                var flowRepos = fsql.GetRepository<FlowModel>();
+
+                var flow = new FlowModel()
+                {
+                    CreateTime = DateTime.Now,
+                    Name = "aaa",
+                    LastModifyTime = DateTime.Now,
+                    UserId = 1,
+                };
+
+                //清理掉数据库中已存在的数据，为了接下来的插入测试
+                flowRepos.Delete(a => a.UserId == 1 &&a.Name== "aaa");
+
+                using (var uow = fsql.CreateUnitOfWork())
+                {
+                    //关闭工作单元（不会开始事务）
+                    uow.Disable();
+                    var uowFlowRepos = uow.GetRepository<FlowModel>();
+                    uowFlowRepos.Insert(flow);
+                    //已关闭工作单元，提不提交都没影响，此处注释来确定工作单元开关是否生效：关闭了，不Commit也应该插入数据
+                    //uow.Commit();
+                }
+                
+                Assert.True(flowRepos.Select.Any(a => a.UserId == 1 && a.Name == "aaa"));
+            }
+
+        }
+
+        [Fact]
+        public void UnitOfWorkRepositoryWithDisableAfterInsert()
+        {
+            foreach (var fsql in new[] {g.sqlite,})
+            {
+                fsql.CodeFirst.ConfigEntity<FlowModel>(f =>
+                {
+                    f.Property(b => b.UserId).IsPrimary(true);
+                    f.Property(b => b.Id).IsPrimary(true).IsIdentity(true);
+                    f.Property(b => b.Name).IsNullable(false);
+                });
+
+                var flowRepos = fsql.GetRepository<FlowModel>();
+
+                //清理掉数据库中已存在的数据，为了接下来的插入测试
+                flowRepos.Delete(a => a.UserId == 1 && a.Name == "aaa");
+
+                var flow = new FlowModel()
+                {
+                    CreateTime = DateTime.Now,
+                    Name = "aaa",
+                    LastModifyTime = DateTime.Now,
+                    UserId = 1,
+                };
+
+
+                Assert.Throws<Exception>(() =>
+                {
+                    using (var uow = fsql.CreateUnitOfWork())
+                    {
+                        var uowFlowRepos = uow.GetRepository<FlowModel>();
+                        uowFlowRepos.Insert(flow);
+                        //有了任意 Insert/Update/Delete 调用关闭uow的方法将会发生异常
+                        uow.Disable();
+                        uow.Commit();
+                    }
+
+                });
+            }
+        }
+
+        [Fact]
+        public void UnitOfWorkRepositoryWithoutDisable()
+        {
+            foreach (var fsql in new[] { g.sqlite, })
+            {
+                fsql.CodeFirst.ConfigEntity<FlowModel>(f =>
+                {
+                    f.Property(b => b.UserId).IsPrimary(true);
+                    f.Property(b => b.Id).IsPrimary(true).IsIdentity(true);
+                    f.Property(b => b.Name).IsNullable(false);
+                });
+
+                var flowRepos = fsql.GetRepository<FlowModel>();
+                if (flowRepos.Select.Any(a => a.UserId == 1 && a.Name == "aaa"))
+                {
+                    flowRepos.Delete(a => a.UserId == 1);
+                }
+
+
+                var flow = new FlowModel()
+                {
+                    CreateTime = DateTime.Now,
+                    Name = "aaa",
+                    LastModifyTime = DateTime.Now,
+                    UserId = 1,
+                };
+
+
+                using (var uow = fsql.CreateUnitOfWork())
+                {
+                    var uowFlowRepos = uow.GetRepository<FlowModel>();
+                    uowFlowRepos.Insert(flow);
+                    //不调用commit将不会提交数据库更改
+                    //uow.Commit();
+                }
+                Assert.False(flowRepos.Select.Any(a => a.UserId == 1 && a.Name == "aaa"));
+            }
+        }
+
+
+        public partial class FlowModel {
 			public int UserId { get; set; }
 			public int Id { get; set; }
 			public int? ParentId { get; set; }

FreeSql.DbContext/UnitOfWork/IUnitOfWork.cs

@@ -12,8 +12,21 @@ public interface IUnitOfWork : IDisposable {
 
 		IsolationLevel? IsolationLevel { get; set; }
 
-		void Commit();
+        /// <summary>
+        /// 是否启用工作单元
+        /// </summary>
+        bool Enable { get; }
+
+        void Commit();
 
 		void Rollback();
-	}
+
+        /// <summary>
+        /// 禁用工作单元
+        /// <exception cref="Exception"></exception>
+        /// <para></para>
+        /// 若已开启事务（已有Insert/Update/Delete操作），调用此方法将发生异常，建议在执行逻辑前调用
+        /// </summary>
+        void Disable();
+    }
 }

FreeSql.DbContext/UnitOfWork/UnitOfWork.cs

@@ -23,12 +23,35 @@ void ReturnObject() {
 			_conn = null;
 		}
 
-		public IsolationLevel? IsolationLevel { get; set; }
+
+        /// <summary>
+        /// 是否启用工作单元
+        /// </summary>
+        public bool Enable { get; private set; } = true;
+
+        /// <summary>
+        /// 禁用工作单元
+        /// <exception cref="Exception"></exception>
+        /// <para></para>
+        /// 若已开启事务（已有Insert/Update/Delete操作），调用此方法将发生异常，建议在执行逻辑前调用
+        /// </summary>
+        public void Disable()
+        {
+            if (_tran != null)
+            {
+                throw new Exception("已开启事务，不能禁用工作单元");
+            }
+
+            Enable = false;
+        }
+
+        public IsolationLevel? IsolationLevel { get; set; }
 
 		public DbTransaction GetOrBeginTransaction(bool isCreate = true) {
 
 			if (_tran != null) return _tran;
 			if (isCreate == false) return null;
+            if (!Enable) return null;
 			if (_conn != null) _fsql.Ado.MasterPool.Return(_conn);
 
 			_conn = _fsql.Ado.MasterPool.Get();