Skip to content

Commit 09c8725

Browse files
28810992881099
committed
v3.2.806-preview20231214
1 parent 1a0507d commit 09c8725

File tree

35 files changed

+180
-50
lines changed

35 files changed

+180
-50
lines changed

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!--
1212
经常出于版本交叉问题，暂时关闭，在每个项目上设置版本号
1313
<PropertyGroup>
14-
<Version>3.2.806-preview20231213</Version>
14+
<Version>3.2.806-preview20231214</Version>
1515
</PropertyGroup>
1616
-->
1717

‎Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepository.cs

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,23 @@ public DbContextOptions DbContextOptions
5757
}
5858
}
5959
public void AsType(Type entityType) => _repository.AsType(entityType);
60-
Func<string, string> _asTableRule;
60+
Func<Type, string, string> _asTableRule;
6161
public void AsTable(Func<string, string> rule)
6262
{
6363
_repository.AsTable(rule);
64-
_asTableRule = rule;
64+
if (rule == null)
65+
{
66+
_asTableRule = null;
67+
return;
68+
}
69+
_asTableRule = (t, old) => t == EntityType ? rule(old) : null;
6570
}
66-
public Type EntityType => _repository.EntityType;
71+
public void AsTable(Func<Type, string, string> rule)
72+
{
73+
_repository.AsTable(rule);
74+
_asTableRule = rule;
75+
}
76+
public Type EntityType => _repository.EntityType;
6777
public IDataFilter<TEntity> DataFilter => _repository.DataFilter;
6878

6979
public void Attach(TEntity entity)

‎Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositoryAsync.cs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,10 @@ async Task<int> DeleteWithinBoundaryAsync(IEnumerable<TEntity> entitys, List<obj
209209
}
210210
var affrows = 0;
211211
for (var a = tracking.DeleteLog.Count - 1; a >= 0; a--)
212-
{
213-
affrows += await Orm.Delete<object>().AsType(tracking.DeleteLog[a].Item1).AsTable(_asTableRule)
214-
.WhereDynamic(tracking.DeleteLog[a].Item2).ExecuteAffrowsAsync(cancellationToken);
212+
{
213+
var delete = Orm.Delete<object>().AsType(tracking.DeleteLog[a].Item1);
214+
if (_asTableRule != null) delete.AsTable(old => _asTableRule(tracking.DeleteLog[a].Item1, old));
215+
affrows += await delete.WhereDynamic(tracking.DeleteLog[a].Item2).ExecuteAffrowsAsync(cancellationToken);
215216
if (deletedOutput != null) deletedOutput.AddRange(tracking.DeleteLog[a].Item2);
216217
UnitOfWork?.EntityChangeReport?.Report.AddRange(tracking.DeleteLog[a].Item2.Select(x =>
217218
new DbContext.EntityChangeReport.ChangeInfo
@@ -249,9 +250,10 @@ async Task<int> SaveTrackingChangeAsync(AggregateRootTrackingChangeInfo tracking
249250
}
250251

251252
for (var a = tracking.DeleteLog.Count - 1; a >= 0; a--)
252-
{
253-
affrows += await Orm.Delete<object>().AsType(tracking.DeleteLog[a].Item1).AsTable(_asTableRule)
254-
.WhereDynamic(tracking.DeleteLog[a].Item2).ExecuteAffrowsAsync(cancellationToken);
253+
{
254+
var delete = Orm.Delete<object>().AsType(tracking.DeleteLog[a].Item1);
255+
if (_asTableRule != null) delete.AsTable(old => _asTableRule(tracking.DeleteLog[a].Item1, old));
256+
affrows += await delete.WhereDynamic(tracking.DeleteLog[a].Item2).ExecuteAffrowsAsync(cancellationToken);
255257
UnitOfWork?.EntityChangeReport?.Report.AddRange(tracking.DeleteLog[a].Item2.Select(x =>
256258
new DbContext.EntityChangeReport.ChangeInfo
257259
{
@@ -274,8 +276,10 @@ async Task<int> SaveTrackingChangeAsync(AggregateRootTrackingChangeInfo tracking
274276
{
275277
foreach (var dl2 in dl.Value)
276278
{
277-
affrows += await Orm.Update<object>().AsType(dl.Key).AsTable(_asTableRule)
278-
.SetSource(dl2.Value.Select(a => a.AfterObject).ToArray())
279+
var update = Orm.Update<object>().AsType(dl.Key);
280+
if (_asTableRule != null) update.AsTable(old => _asTableRule(dl.Key, old));
281+
affrows += await update
282+
.SetSource(dl2.Value.Select(a => a.AfterObject).ToArray())
279283
.UpdateColumns(dl2.Value.First().UpdateColumns.ToArray())
280284
.ExecuteAffrowsAsync(cancellationToken);
281285
UnitOfWork?.EntityChangeReport?.Report.AddRange(dl2.Value.Select(x =>

‎Extensions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepositorySync.cs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,10 @@ int DeleteWithinBoundary(IEnumerable<TEntity> entitys, List<object> deletedOutpu
261261
}
262262
var affrows = 0;
263263
for (var a = tracking.DeleteLog.Count - 1; a >= 0; a--)
264-
{
265-
affrows += Orm.Delete<object>().AsType(tracking.DeleteLog[a].Item1).AsTable(_asTableRule)
266-
.WhereDynamic(tracking.DeleteLog[a].Item2).ExecuteAffrows();
264+
{
265+
var delete = Orm.Delete<object>().AsType(tracking.DeleteLog[a].Item1);
266+
if (_asTableRule != null) delete.AsTable(old => _asTableRule(tracking.DeleteLog[a].Item1, old));
267+
affrows += delete.WhereDynamic(tracking.DeleteLog[a].Item2).ExecuteAffrows();
267268
if (deletedOutput != null) deletedOutput.AddRange(tracking.DeleteLog[a].Item2);
268269
UnitOfWork?.EntityChangeReport?.Report.AddRange(tracking.DeleteLog[a].Item2.Select(x =>
269270
new DbContext.EntityChangeReport.ChangeInfo
@@ -300,9 +301,10 @@ int SaveTrackingChange(AggregateRootTrackingChangeInfo tracking)
300301
}
301302

302303
for (var a = tracking.DeleteLog.Count - 1; a >= 0; a--)
303-
{
304-
affrows += Orm.Delete<object>().AsType(tracking.DeleteLog[a].Item1).AsTable(_asTableRule)
305-
.WhereDynamic(tracking.DeleteLog[a].Item2).ExecuteAffrows();
304+
{
305+
var delete = Orm.Delete<object>().AsType(tracking.DeleteLog[a].Item1);
306+
if (_asTableRule != null) delete.AsTable(old => _asTableRule(tracking.DeleteLog[a].Item1, old));
307+
affrows += delete.WhereDynamic(tracking.DeleteLog[a].Item2).ExecuteAffrows();
306308
UnitOfWork?.EntityChangeReport?.Report.AddRange(tracking.DeleteLog[a].Item2.Select(x =>
307309
new DbContext.EntityChangeReport.ChangeInfo
308310
{
@@ -325,8 +327,10 @@ int SaveTrackingChange(AggregateRootTrackingChangeInfo tracking)
325327
{
326328
foreach (var dl2 in dl.Value)
327329
{
328-
affrows += Orm.Update<object>().AsType(dl.Key).AsTable(_asTableRule)
329-
.SetSource(dl2.Value.Select(a => a.AfterObject).ToArray())
330+
var update = Orm.Update<object>().AsType(dl.Key);
331+
if (_asTableRule != null) update.AsTable(old => _asTableRule(dl.Key, old));
332+
affrows += update
333+
.SetSource(dl2.Value.Select(a => a.AfterObject).ToArray())
330334
.UpdateColumns(dl2.Value.First().UpdateColumns.ToArray())
331335
.ExecuteAffrows();
332336
UnitOfWork?.EntityChangeReport?.Report.AddRange(dl2.Value.Select(x =>

‎Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.806-preview20231213</Version>
21+
<Version>3.2.806-preview20231214</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
2121
<LangVersion>latest</LangVersion>
22-
<Version>3.2.806-preview20231213</Version>
22+
<Version>3.2.806-preview20231214</Version>
2323
<PackageReadmeFile>readme.md</PackageReadmeFile>
2424
</PropertyGroup>
2525

‎Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.806-preview20231213</Version>
21+
<Version>3.2.806-preview20231214</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Title>$(AssemblyName)</Title>
1616
<IsPackable>true</IsPackable>
1717
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
18-
<Version>3.2.806-preview20231213</Version>
18+
<Version>3.2.806-preview20231214</Version>
1919
<PackageReadmeFile>readme.md</PackageReadmeFile>
2020
</PropertyGroup>
2121

‎Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.806-preview20231213</Version>
21+
<Version>3.2.806-preview20231214</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Extensions/FreeSql.Generator/FreeSql.Generator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
1414
<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
1515
<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
16-
<Version>3.2.806-preview20231213</Version>
16+
<Version>3.2.806-preview20231214</Version>
1717
<PackageReadmeFile>readme.md</PackageReadmeFile>
1818
</PropertyGroup>
1919

‎FreeSql.All/FreeSql.All.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<SignAssembly>true</SignAssembly>
1818
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
1919
<DelaySign>false</DelaySign>
20-
<Version>3.2.806-preview20231213</Version>
20+
<Version>3.2.806-preview20231214</Version>
2121
<PackageReadmeFile>readme.md</PackageReadmeFile>
2222
</PropertyGroup>
2323

‎FreeSql.DbContext/FreeSql.DbContext.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<SignAssembly>true</SignAssembly>
1818
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
1919
<DelaySign>false</DelaySign>
20-
<Version>3.2.806-preview20231213</Version>
20+
<Version>3.2.806-preview20231214</Version>
2121
<PackageReadmeFile>readme.md</PackageReadmeFile>
2222
</PropertyGroup>
2323

‎FreeSql.Repository/FreeSql.Repository.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<SignAssembly>true</SignAssembly>
1818
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
1919
<DelaySign>false</DelaySign>
20-
<Version>3.2.806-preview20231213</Version>
20+
<Version>3.2.806-preview20231214</Version>
2121
<PackageReadmeFile>readme.md</PackageReadmeFile>
2222
</PropertyGroup>
2323

‎FreeSql/FreeSql.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<SignAssembly>true</SignAssembly>
1818
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
1919
<DelaySign>false</DelaySign>
20-
<Version>3.2.806-preview20231213</Version>
20+
<Version>3.2.806-preview20231214</Version>
2121
<PackageReadmeFile>readme.md</PackageReadmeFile>
2222
</PropertyGroup>
2323

‎FreeSql/FreeSql.xml

Lines changed: 112 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Providers/FreeSql.Provider.ClickHouse/FreeSql.Provider.ClickHouse.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<SignAssembly>False</SignAssembly>
2020
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2121
<DelaySign>false</DelaySign>
22-
<Version>3.2.806-preview20231213</Version>
22+
<Version>3.2.806-preview20231214</Version>
2323
<PackageReadmeFile>readme.md</PackageReadmeFile>
2424
</PropertyGroup>
2525

‎Providers/FreeSql.Provider.Custom/FreeSql.Provider.Custom.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.806-preview20231213</Version>
21+
<Version>3.2.806-preview20231214</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Providers/FreeSql.Provider.Dameng/FreeSql.Provider.Dameng.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Title>$(AssemblyName)</Title>
1616
<IsPackable>true</IsPackable>
1717
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
18-
<Version>3.2.806-preview20231213</Version>
18+
<Version>3.2.806-preview20231214</Version>
1919
<PackageReadmeFile>readme.md</PackageReadmeFile>
2020
</PropertyGroup>
2121

‎Providers/FreeSql.Provider.Firebird/FreeSql.Provider.Firebird.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.806-preview20231213</Version>
21+
<Version>3.2.806-preview20231214</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Providers/FreeSql.Provider.GBase/FreeSql.Provider.GBase.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.806-preview20231213</Version>
21+
<Version>3.2.806-preview20231214</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Providers/FreeSql.Provider.KingbaseES/FreeSql.Provider.KingbaseES.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Title>$(AssemblyName)</Title>
1616
<IsPackable>true</IsPackable>
1717
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
18-
<Version>3.2.806-preview20231213</Version>
18+
<Version>3.2.806-preview20231214</Version>
1919
<PackageReadmeFile>readme.md</PackageReadmeFile>
2020
</PropertyGroup>
2121

‎Providers/FreeSql.Provider.MsAccess/FreeSql.Provider.MsAccess.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.806-preview20231213</Version>
21+
<Version>3.2.806-preview20231214</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

‎Providers/FreeSql.Provider.MySql/FreeSql.Provider.MySql.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.806-preview20231213</Version>
21+
<Version>3.2.806-preview20231214</Version>
2222
<PackageReadmeFile>readme.md</PackageReadmeFile>
2323
</PropertyGroup>
2424

0 commit comments

Comments
 (0)