tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 18:52:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

v3.2.701-preview20230823

Browse Source
This commit is contained in:
2881099 2023-08-22 14:43:42 +08:00
parent 6a79b63d94
commit 84dd1b9172
32 changed files with 86 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

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

2
Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj
View File

@ -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>

2
Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj
View File

@ -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>

2
Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj
View File

@ -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>

2
Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj
View File

@ -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>

2
Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj
View File

@ -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>

2
Extensions/FreeSql.Generator/FreeSql.Generator.csproj
View File

@ -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>

2
FreeSql.All/FreeSql.All.csproj
View File

@ -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>

2
FreeSql.DbContext/FreeSql.DbContext.csproj
View File

@ -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>

2
FreeSql.Repository/FreeSql.Repository.csproj
View File

@ -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>

2
FreeSql/FreeSql.csproj
View File

@ -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>

142
FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs
View File

@ -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)
{
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);
}
else
{
@ -405,29 +408,9 @@ namespace FreeSql.Internal.CommonProvider
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,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)
{
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);
}
else
{
@ -548,29 +534,9 @@ namespace FreeSql.Internal.CommonProvider
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));
}

2
Providers/FreeSql.Provider.ClickHouse/FreeSql.Provider.ClickHouse.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.Custom/FreeSql.Provider.Custom.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.GBase/FreeSql.Provider.GBase.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.MySqlConnector/FreeSql.Provider.MySqlConnector.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.Odbc/FreeSql.Provider.Odbc.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.Oracle/FreeSql.Provider.Oracle.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.OracleOledb/FreeSql.Provider.OracleOledb.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.PostgreSQL/FreeSql.Provider.PostgreSQL.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.QuestDb/FreeSql.Provider.QuestDb.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.ShenTong/FreeSql.Provider.ShenTong.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.SqlServer/FreeSql.Provider.SqlServer.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.SqlServerForSystem/FreeSql.Provider.SqlServerForSystem.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.Sqlite/FreeSql.Provider.Sqlite.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.SqliteCore/FreeSql.Provider.SqliteCore.csproj
View File

@ -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>

2
Providers/FreeSql.Provider.Xugu/FreeSql.Provider.Xugu.csproj
View File

@ -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>