v3.2.701-preview20230823

Directory.Build.props

@@ -11,7 +11,7 @@
 	<!--
 	经常出于版本交叉问题，暂时关闭，在每个项目上设置版本号
 	<PropertyGroup>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 	-->
 	

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs

@@ -360,6 +360,29 @@ namespace FreeSql.Internal.CommonProvider
             if (_sourceSql != null) return this.RawExecuteAffrows();
             var affrows = 0;
             var ss = SplitSourceByIdentityValueIsNull(_source);
+
+            void ExecuteBatchOptions(List<T1>[] splitedSource)
+            {
+                foreach (var tmpsource in splitedSource)
+                {
+                    if (_batchValuesLimit > 0)
+                    {
+                        var pageTotal = (int)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();
+                        }
+                    }
+                    else
+                    {
+                        _source = tmpsource;
+                        affrows += this.RawExecuteAffrows();
+                    }
+                }
+            }
             try
             {
                 if (_transaction == null)
@@ -371,29 +394,9 @@ namespace FreeSql.Internal.CommonProvider
                 if (_transaction != null || _orm.Ado.MasterPool == null || _batchAutoTransaction == false)
                 {
                     _SplitSourceByIdentityValueIsNullFlag = 1;
-                    foreach (var tmpsource in ss.Item1)
+                    ExecuteBatchOptions(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();
-                        }
-                    }
                     _SplitSourceByIdentityValueIsNullFlag = 2;
-                    foreach (var tmpsource in ss.Item2)
+                    ExecuteBatchOptions(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();
-                        }
-                    }
                 }
                 else
                 {
@@ -405,29 +408,9 @@ namespace FreeSql.Internal.CommonProvider
                         try
                         {
                             _SplitSourceByIdentityValueIsNullFlag = 1;
-                            foreach (var tmpsource in ss.Item1)
+                            ExecuteBatchOptions(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();
-                                }
-                            }
                             _SplitSourceByIdentityValueIsNullFlag = 2;
-                            foreach (var tmpsource in ss.Item2)
+                            ExecuteBatchOptions(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();
-                                }
-                            }
                             _transaction.Commit();
                             _orm.Aop.TraceAfterHandler?.Invoke(this, new Aop.TraceAfterEventArgs(transBefore, CoreStrings.Commit, null));
                         }
@@ -503,6 +486,29 @@ namespace FreeSql.Internal.CommonProvider
             if (_sourceSql != null) return await this.RawExecuteAffrowsAsync(cancellationToken);
             var affrows = 0;
             var ss = SplitSourceByIdentityValueIsNull(_source);
+
+            async Task ExecuteBatchOptions(List<T1>[] splitedSource)
+            {
+                foreach (var tmpsource in splitedSource)
+                {
+                    if (_batchValuesLimit > 0)
+                    {
+                        var pageTotal = (int)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);
+                        }
+                    }
+                    else
+                    {
+                        _source = tmpsource; 
+                        affrows += await this.RawExecuteAffrowsAsync(cancellationToken);
+                    }
+                }
+            }
             try
             {
                 if (_transaction == null)
@@ -514,29 +520,9 @@ namespace FreeSql.Internal.CommonProvider
                 if (_transaction != null || _orm.Ado.MasterPool == null || _batchAutoTransaction == false)
                 {
                     _SplitSourceByIdentityValueIsNullFlag = 1;
-                    foreach (var tmpsource in ss.Item1)
+                    await ExecuteBatchOptions(ss.Item1);
-                    {
+                     _SplitSourceByIdentityValueIsNullFlag = 2;
-                        var pageTotal = Math.Ceiling(tmpsource.Count * 1.0 / _batchValuesLimit);
+                    await ExecuteBatchOptions(ss.Item2);
-                        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);
-                        }
-                    }
-                    _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);
-                        }
-                    }
                 }
                 else
                 {
@@ -548,29 +534,9 @@ namespace FreeSql.Internal.CommonProvider
                         try
                         {
                             _SplitSourceByIdentityValueIsNullFlag = 1;
-                            foreach (var tmpsource in ss.Item1)
+                            await ExecuteBatchOptions(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);
-                                }
-                            }
                             _SplitSourceByIdentityValueIsNullFlag = 2;
-                            foreach (var tmpsource in ss.Item2)
+                            await ExecuteBatchOptions(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);
-                                }
-                            }
                             _transaction.Commit();
                             _orm.Aop.TraceAfterHandler?.Invoke(this, new Aop.TraceAfterEventArgs(transBefore, CoreStrings.Commit, null));
                         }

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

Providers/FreeSql.Provider.OracleOledb/FreeSql.Provider.OracleOledb.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>

Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.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>

Providers/FreeSql.Provider.QuestDb/FreeSql.Provider.QuestDb.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>

Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.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>

Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj

@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<DelaySign>false</DelaySign>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
-		<Version>3.2.701-preview20230822</Version>
+		<Version>3.2.701-preview20230823</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.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>

Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.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>

Providers/FreeSql.Provider.SqliteCore/FreeSql.Provider.SqliteCore.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>

Providers/FreeSql.Provider.Xugu/FreeSql.Provider.Xugu.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>