- 修复 2.0.103 Uow.Orm 事务 bug；

2881099 · 2881099 · commit 32d4f671fe73 · 2020-12-07T15:44:12.000+08:00
diff --git a/Examples/aspnetcore_transaction/Controllers/HomeController.cs b/Examples/aspnetcore_transaction/Controllers/HomeController.cs
@@ -27,6 +27,10 @@ public HomeController(ILogger<HomeController> logger)
         virtual public object Get([FromServices] BaseRepository<Song> repoSong, [FromServices] BaseRepository<Detail> repoDetail, [FromServices] SongRepository repoSong2,
             [FromServices] SongService serviceSong)
         {
+            //repoSong.Insert(new Song());
+            //repoDetail.Insert(new Detail());
+            //repoSong2.Insert(new Song());
+
             serviceSong.Test1();
             return "111";
         }
diff --git a/Examples/aspnetcore_transaction/aspnetcore_transaction.csproj b/Examples/aspnetcore_transaction/aspnetcore_transaction.csproj
@@ -12,8 +12,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
-		<PackageReference Include="FreeSql.DynamicProxy" Version="1.4.0" />
-		<PackageReference Include="IdleBus" Version="1.5.0" />
+		<PackageReference Include="FreeSql.DynamicProxy" Version="1.5.0" />
+		<PackageReference Include="IdleBus" Version="1.5.2" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/FreeSql.DbContext/UnitOfWork/UnitOfWorkManager.cs b/FreeSql.DbContext/UnitOfWork/UnitOfWorkManager.cs
@@ -13,7 +13,8 @@ namespace FreeSql
     /// </summary>
     public class UnitOfWorkManager : IDisposable
     {
-        DbContextScopedFreeSql _ormScoped;
+        internal DbContextScopedFreeSql _ormScoped;
+        internal IFreeSql OrmOriginal => _ormScoped?._originalFsql;
         public IFreeSql Orm => _ormScoped;
         List<UowInfo> _rawUows = new List<UowInfo>();
         List<UowInfo> _allUows = new List<UowInfo>();
@@ -136,7 +137,7 @@ IUnitOfWork CreateUowNothing(bool isNotSupported)
         }
         IUnitOfWork CreateUow(IsolationLevel? isolationLevel)
         {
-            var uow = new UnitOfWorkOrginal(new UnitOfWork(Orm));
+            var uow = new UnitOfWorkOrginal(new UnitOfWork(OrmOriginal));
             var uowInfo = new UowInfo(uow, UowInfo.UowType.Orginal, false);
             if (isolationLevel != null) uow.IsolationLevel = isolationLevel.Value;
             try { uow.GetOrBeginTransaction(); }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@ public HomeController(ILogger<HomeController> logger)`
`27`	`27`	`virtual public object Get([FromServices] BaseRepository<Song> repoSong, [FromServices] BaseRepository<Detail> repoDetail, [FromServices] SongRepository repoSong2,`
`28`	`28`	`[FromServices] SongService serviceSong)`
`29`	`29`	`{`
	`30`	`+ //repoSong.Insert(new Song());`
	`31`	`+ //repoDetail.Insert(new Detail());`
	`32`	`+ //repoSong2.Insert(new Song());`
	`33`	`+`
`30`	`34`	`serviceSong.Test1();`
`31`	`35`	`return "111";`
`32`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@ namespace FreeSql`
`13`	`13`	`/// </summary>`
`14`	`14`	`public class UnitOfWorkManager : IDisposable`
`15`	`15`	`{`
`16`		`- DbContextScopedFreeSql _ormScoped;`
	`16`	`+ internal DbContextScopedFreeSql _ormScoped;`
	`17`	`+ internal IFreeSql OrmOriginal => _ormScoped?._originalFsql;`
`17`	`18`	`public IFreeSql Orm => _ormScoped;`
`18`	`19`	`List<UowInfo> _rawUows = new List<UowInfo>();`
`19`	`20`	`List<UowInfo> _allUows = new List<UowInfo>();`
`@@ -136,7 +137,7 @@ IUnitOfWork CreateUowNothing(bool isNotSupported)`
`136`	`137`	`}`
`137`	`138`	`IUnitOfWork CreateUow(IsolationLevel? isolationLevel)`
`138`	`139`	`{`
`139`		`- var uow = new UnitOfWorkOrginal(new UnitOfWork(Orm));`
	`140`	`+ var uow = new UnitOfWorkOrginal(new UnitOfWork(OrmOriginal));`
`140`	`141`	`var uowInfo = new UowInfo(uow, UowInfo.UowType.Orginal, false);`
`141`	`142`	`if (isolationLevel != null) uow.IsolationLevel = isolationLevel.Value;`
`142`	`143`	`try { uow.GetOrBeginTransaction(); }`