v3.2.701-preview20230823

dotnetcore · Aug 22, 2023 · 84dd1b9 · 84dd1b9
1 parent 6a79b63
commit 84dd1b9
Show file tree

Hide file tree

Showing 32 changed files with 84 additions and 118 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -11,7 +11,7 @@
 	<!--
 	经常出于版本交叉问题，暂时关闭，在每个项目上设置版本号
 	<PropertyGroup>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 	-->
 

diff --git a/Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj b/Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj b/Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj
@@ -19,7 +19,7 @@
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
 		<LangVersion>latest</LangVersion>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj b/Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj b/Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj
@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj b/Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Extensions/FreeSql.Generator/FreeSql.Generator.csproj b/Extensions/FreeSql.Generator/FreeSql.Generator.csproj
@@ -13,7 +13,7 @@
 		<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
 		<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/FreeSql.All/FreeSql.All.csproj b/FreeSql.All/FreeSql.All.csproj
@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/FreeSql.DbContext/FreeSql.DbContext.csproj b/FreeSql.DbContext/FreeSql.DbContext.csproj
@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/FreeSql.Repository/FreeSql.Repository.csproj b/FreeSql.Repository/FreeSql.Repository.csproj
@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/FreeSql/FreeSql.csproj b/FreeSql/FreeSql.csproj
@@ -17,7 +17,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs b/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs
@@ -360,20 +360,14 @@ public int ExecuteAffrows()
             if (_sourceSql != null) return this.RawExecuteAffrows();
             var affrows = 0;
             var ss = SplitSourceByIdentityValueIsNull(_source);
-            try
-            {
-                if (_transaction == null)
-                {
-                    var threadTransaction = _orm.Ado.TransactionCurrentThread;
-                    if (threadTransaction != null) this.WithTransaction(threadTransaction);
-                }
 
-                if (_transaction != null || _orm.Ado.MasterPool == null || _batchAutoTransaction == false)
+            void ExecuteBatchOptions(List<T1>[] splitedSource)
+            {
+                foreach (var tmpsource in splitedSource)
                 {
-                    _SplitSourceByIdentityValueIsNullFlag = 1;
-                    foreach (var tmpsource in ss.Item1)
+                    if (_batchValuesLimit > 0)
                     {
-                        var pageTotal = Math.Ceiling(tmpsource.Count * 1.0 / _batchValuesLimit);
+                        var pageTotal = (int)Math.Ceiling(tmpsource.Count * 1.0 / _batchValuesLimit);
                         for (var pageNumber = 1; pageNumber <= pageTotal; pageNumber++)
                         {
                             _source = pageNumber > 1 ?
@@ -382,19 +376,28 @@ public int ExecuteAffrows()
                             affrows += this.RawExecuteAffrows();
                         }
                     }
-                    _SplitSourceByIdentityValueIsNullFlag = 2;
-                    foreach (var tmpsource in ss.Item2)
+                    else
                     {
-                        var pageTotal = Math.Ceiling(tmpsource.Count * 1.0 / _batchValuesLimit);
-                        for (var pageNumber = 1; pageNumber <= pageTotal; pageNumber++)
-                        {
-                            _source = pageNumber > 1 ?
-                                tmpsource.Skip((pageNumber - 1) * _batchValuesLimit).Take(_batchValuesLimit).ToList() :
-                                tmpsource.Take(_batchValuesLimit).ToList();
-                            affrows += this.RawExecuteAffrows();
-                        }
+                        _source = tmpsource;
+                        affrows += this.RawExecuteAffrows();
                     }
                 }
+            }
+            try
+            {
+                if (_transaction == null)
+                {
+                    var threadTransaction = _orm.Ado.TransactionCurrentThread;
+                    if (threadTransaction != null) this.WithTransaction(threadTransaction);
+                }
+
+                if (_transaction != null || _orm.Ado.MasterPool == null || _batchAutoTransaction == false)
+                {
+                    _SplitSourceByIdentityValueIsNullFlag = 1;
+                    ExecuteBatchOptions(ss.Item1);
+                    _SplitSourceByIdentityValueIsNullFlag = 2;
+                    ExecuteBatchOptions(ss.Item2);
+                }
                 else
                 {
                     using (var conn = _orm.Ado.MasterPool.Get())
@@ -405,29 +408,9 @@ public int ExecuteAffrows()
                         try
                         {
                             _SplitSourceByIdentityValueIsNullFlag = 1;
-                            foreach (var tmpsource in ss.Item1)
-                            {
-                                var pageTotal = Math.Ceiling(tmpsource.Count * 1.0 / _batchValuesLimit);
-                                for (var pageNumber = 1; pageNumber <= pageTotal; pageNumber++)
-                                {
-                                    _source = pageNumber > 1 ?
-                                        tmpsource.Skip((pageNumber - 1) * _batchValuesLimit).Take(_batchValuesLimit).ToList() :
-                                        tmpsource.Take(_batchValuesLimit).ToList();
-                                    affrows += this.RawExecuteAffrows();
-                                }
-                            }
+                            ExecuteBatchOptions(ss.Item1);
                             _SplitSourceByIdentityValueIsNullFlag = 2;
-                            foreach (var tmpsource in ss.Item2)
-                            {
-                                var pageTotal = Math.Ceiling(tmpsource.Count * 1.0 / _batchValuesLimit);
-                                for (var pageNumber = 1; pageNumber <= pageTotal; pageNumber++)
-                                {
-                                    _source = pageNumber > 1 ?
-                                        tmpsource.Skip((pageNumber - 1) * _batchValuesLimit).Take(_batchValuesLimit).ToList() :
-                                        tmpsource.Take(_batchValuesLimit).ToList();
-                                    affrows += this.RawExecuteAffrows();
-                                }
-                            }
+                            ExecuteBatchOptions(ss.Item2);
                             _transaction.Commit();
                             _orm.Aop.TraceAfterHandler?.Invoke(this, new Aop.TraceAfterEventArgs(transBefore, CoreStrings.Commit, null));
                         }
@@ -503,41 +486,44 @@ async public Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken =
             if (_sourceSql != null) return await this.RawExecuteAffrowsAsync(cancellationToken);
             var affrows = 0;
             var ss = SplitSourceByIdentityValueIsNull(_source);
-            try
-            {
-                if (_transaction == null)
-                {
-                    var threadTransaction = _orm.Ado.TransactionCurrentThread;
-                    if (threadTransaction != null) this.WithTransaction(threadTransaction);
-                }
 
-                if (_transaction != null || _orm.Ado.MasterPool == null || _batchAutoTransaction == false)
+            async Task ExecuteBatchOptions(List<T1>[] splitedSource)
+            {
+                foreach (var tmpsource in splitedSource)
                 {
-                    _SplitSourceByIdentityValueIsNullFlag = 1;
-                    foreach (var tmpsource in ss.Item1)
+                    if (_batchValuesLimit > 0)
                     {
-                        var pageTotal = Math.Ceiling(tmpsource.Count * 1.0 / _batchValuesLimit);
+                        var pageTotal = (int)Math.Ceiling(tmpsource.Count * 1.0 / _batchValuesLimit);
                         for (var pageNumber = 1; pageNumber <= pageTotal; pageNumber++)
                         {
-                            _source = pageNumber > 1 ? 
+                            _source = pageNumber > 1 ?
                                 tmpsource.Skip((pageNumber - 1) * _batchValuesLimit).Take(_batchValuesLimit).ToList() :
                                 tmpsource.Take(_batchValuesLimit).ToList();
                             affrows += await this.RawExecuteAffrowsAsync(cancellationToken);
                         }
                     }
-                    _SplitSourceByIdentityValueIsNullFlag = 2;
-                    foreach (var tmpsource in ss.Item2)
+                    else
                     {
-                        var pageTotal = Math.Ceiling(tmpsource.Count * 1.0 / _batchValuesLimit);
-                        for (var pageNumber = 1; pageNumber <= pageTotal; pageNumber++)
-                        {
-                            _source = pageNumber > 1 ?
-                                tmpsource.Skip((pageNumber - 1) * _batchValuesLimit).Take(_batchValuesLimit).ToList() :
-                                tmpsource.Take(_batchValuesLimit).ToList();
-                            affrows += await this.RawExecuteAffrowsAsync(cancellationToken);
-                        }
+                        _source = tmpsource; 
+                        affrows += await this.RawExecuteAffrowsAsync(cancellationToken);
                     }
                 }
+            }
+            try
+            {
+                if (_transaction == null)
+                {
+                    var threadTransaction = _orm.Ado.TransactionCurrentThread;
+                    if (threadTransaction != null) this.WithTransaction(threadTransaction);
+                }
+
+                if (_transaction != null || _orm.Ado.MasterPool == null || _batchAutoTransaction == false)
+                {
+                    _SplitSourceByIdentityValueIsNullFlag = 1;
+                    await ExecuteBatchOptions(ss.Item1);
+                     _SplitSourceByIdentityValueIsNullFlag = 2;
+                    await ExecuteBatchOptions(ss.Item2);
+                }
                 else
                 {
                     using (var conn = await _orm.Ado.MasterPool.GetAsync())
@@ -548,29 +534,9 @@ async public Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken =
                         try
                         {
                             _SplitSourceByIdentityValueIsNullFlag = 1;
-                            foreach (var tmpsource in ss.Item1)
-                            {
-                                var pageTotal = Math.Ceiling(tmpsource.Count * 1.0 / _batchValuesLimit);
-                                for (var pageNumber = 1; pageNumber <= pageTotal; pageNumber++)
-                                {
-                                    _source = pageNumber > 1 ?
-                                        tmpsource.Skip((pageNumber - 1) * _batchValuesLimit).Take(_batchValuesLimit).ToList() :
-                                        tmpsource.Take(_batchValuesLimit).ToList();
-                                    affrows += await this.RawExecuteAffrowsAsync(cancellationToken);
-                                }
-                            }
+                            await ExecuteBatchOptions(ss.Item1);
                             _SplitSourceByIdentityValueIsNullFlag = 2;
-                            foreach (var tmpsource in ss.Item2)
-                            {
-                                var pageTotal = Math.Ceiling(tmpsource.Count * 1.0 / _batchValuesLimit);
-                                for (var pageNumber = 1; pageNumber <= pageTotal; pageNumber++)
-                                {
-                                    _source = pageNumber > 1 ?
-                                        tmpsource.Skip((pageNumber - 1) * _batchValuesLimit).Take(_batchValuesLimit).ToList() :
-                                        tmpsource.Take(_batchValuesLimit).ToList();
-                                    affrows += await this.RawExecuteAffrowsAsync(cancellationToken);
-                                }
-                            }
+                            await ExecuteBatchOptions(ss.Item2);
                             _transaction.Commit();
                             _orm.Aop.TraceAfterHandler?.Invoke(this, new Aop.TraceAfterEventArgs(transBefore, CoreStrings.Commit, null));
                         }

diff --git a/Providers/FreeSql.Provider.ClickHouse/FreeSql.Provider.ClickHouse.csproj b/Providers/FreeSql.Provider.ClickHouse/FreeSql.Provider.ClickHouse.csproj
@@ -19,7 +19,7 @@
 		<SignAssembly>False</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Providers/FreeSql.Provider.Custom/FreeSql.Provider.Custom.csproj b/Providers/FreeSql.Provider.Custom/FreeSql.Provider.Custom.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj b/Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj
@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj b/Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Providers/FreeSql.Provider.GBase/FreeSql.Provider.GBase.csproj b/Providers/FreeSql.Provider.GBase/FreeSql.Provider.GBase.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj b/Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj
@@ -15,7 +15,7 @@
 		<Title>$(AssemblyName)</Title>
 		<IsPackable>true</IsPackable>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj b/Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj b/Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj b/Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj b/Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj b/Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>