- 修复 2.0.103 Uow.Orm 事务 bug；

fyp111486 · Dec 7, 2020 · 87f2cba · 87f2cba
1 parent ff1354d
commit 87f2cba
Show file tree

Hide file tree

Showing 5 changed files with 215 additions and 10 deletions.
diff --git a/FreeSql.DbContext/DbContext/DbContextScopedFreeSql.cs b/FreeSql.DbContext/DbContext/DbContextScopedFreeSql.cs
@@ -48,6 +48,8 @@ public ScopeTransactionAdo(AdoProvider ado, Func<DbTransaction> resolveTran) : b
                 base.ConnectionString = ado.ConnectionString;
                 base.SlaveConnectionStrings = ado.SlaveConnectionStrings;
                 base.Identifier = ado.Identifier;
+                base.MasterPool = ado.MasterPool;
+                base._util = ado._util;
             }
             public override object AddslashesProcessParam(object param, Type mapType, ColumnInfo mapColumn) => _ado.AddslashesProcessParam(param, mapType, mapColumn);
             public override DbCommand CreateCommand() => _ado.CreateCommand();

diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
diff --git a/FreeSql.Tests/FreeSql.Tests.DbContext/RepositoryTests.cs b/FreeSql.Tests/FreeSql.Tests.DbContext/RepositoryTests.cs
@@ -499,6 +499,35 @@ class BeginEdit01
             public string Name { get; set; }
         }
 
+        [Fact]
+        public void OrmScoped()
+        {
+            var fsql = g.sqlserver;
+            //fsql.Aop.CommandBefore += (s, e) =>
+            //{
+            //    Console.WriteLine(e.Command.CommandText);
+            //};
+
+            var repo = fsql.GetRepository<ts_repo_update_bit>();
+            repo.Orm.Ado.ExecuteNonQuery("select 1");
+
+            using (var ctx = fsql.CreateDbContext())
+            {
+                ctx.Orm.Ado.ExecuteNonQuery("select 1");
+            }
+
+            using (var uow = fsql.CreateUnitOfWork())
+            {
+                uow.Orm.Ado.ExecuteNonQuery("select 1");
+            }
+
+            using (var uow = fsql.CreateUnitOfWork())
+            {
+                repo.UnitOfWork = uow;
+                repo.Orm.Ado.ExecuteNonQuery("select 1");
+            }
+        }
+
         [Fact]
         public void UpdateBit()
         {

diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
diff --git a/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs b/FreeSql/Internal/CommonProvider/AdoProvider/AdoProvider.cs
@@ -31,7 +31,7 @@ public abstract partial class AdoProvider : IAdo, IDisposable
         public string[] SlaveConnectionStrings { get; protected set; }
         public Guid Identifier { get; protected set; }
 
-        protected CommonUtils _util { get; set; }
+        public CommonUtils _util { get; set; }
         protected int slaveUnavailables = 0;
         private object slaveLock = new object();
         private Random slaveRandom = new Random();