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

- 优化 DbContext/Repository ManyToMany联级保存功能，当是新增数据时不查询中间表记录对比差异（直接插入）；

Browse Source
This commit is contained in:
28810 2019-09-29 19:06:31 +08:00
parent da24b9f8e4
commit 5a8188739c
5 changed files with 64 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
FreeSql.DbContext/DbContext/DbContext.cs
View File

@ -34,9 +34,12 @@ namespace FreeSql
set => _optionsPriv = value; set => _optionsPriv = value;
get get
{ {
if (_optionsPriv != null) return _optionsPriv; if (_optionsPriv == null)
if (FreeSqlDbContextExtensions._dicSetDbContextOptions.TryGetValue(Orm, out _optionsPriv)) return _optionsPriv; {
_optionsPriv = new DbContextOptions(); _optionsPriv = new DbContextOptions();
if (FreeSqlDbContextExtensions._dicSetDbContextOptions.TryGetValue(Orm, out var opt))
_optionsPriv.EnableAddOrUpdateNavigateList = opt.EnableAddOrUpdateNavigateList;
}
return _optionsPriv; return _optionsPriv;
} }
} }

8
FreeSql.DbContext/DbSet/DbSet.cs
View File

@ -128,6 +128,14 @@ namespace FreeSql
return this; return this;
} }
Dictionary<Type, DbSet<object>> _dicDbSetObjects = new Dictionary<Type, DbSet<object>>();
DbSet<object> GetDbSetObject(Type et)
{
if (_dicDbSetObjects.TryGetValue(et, out var tryds)) return tryds;
_dicDbSetObjects.Add(et, tryds = _db.Set<object>().AsType(et));
return tryds;
}
public class EntityState public class EntityState
{ {
public EntityState(TEntity value, string key) public EntityState(TEntity value, string key)

28
FreeSql.DbContext/DbSet/DbSetAsync.cs
View File

@ -47,7 +47,7 @@ namespace FreeSql
_db.Orm.SetEntityIdentityValueWithPrimary(_entityType, data, idtval); _db.Orm.SetEntityIdentityValueWithPrimary(_entityType, data, idtval);
Attach(data); Attach(data);
if (_db.Options.EnableAddOrUpdateNavigateList) if (_db.Options.EnableAddOrUpdateNavigateList)
await AddOrUpdateNavigateListAsync(data); await AddOrUpdateNavigateListAsync(data, true);
} }
else else
{ {
@ -57,7 +57,7 @@ namespace FreeSql
_db.Orm.MapEntityValue(_entityType, newval, data); _db.Orm.MapEntityValue(_entityType, newval, data);
Attach(newval); Attach(newval);
if (_db.Options.EnableAddOrUpdateNavigateList) if (_db.Options.EnableAddOrUpdateNavigateList)
await AddOrUpdateNavigateListAsync(data); await AddOrUpdateNavigateListAsync(data, true);
} }
return; return;
default: default:
@ -69,7 +69,7 @@ namespace FreeSql
_db.Orm.SetEntityIdentityValueWithPrimary(_entityType, data, idtval); _db.Orm.SetEntityIdentityValueWithPrimary(_entityType, data, idtval);
Attach(data); Attach(data);
if (_db.Options.EnableAddOrUpdateNavigateList) if (_db.Options.EnableAddOrUpdateNavigateList)
await AddOrUpdateNavigateListAsync(data); await AddOrUpdateNavigateListAsync(data, true);
} }
return; return;
} }
@ -77,7 +77,7 @@ namespace FreeSql
EnqueueToDbContext(DbContext.ExecCommandInfoType.Insert, CreateEntityState(data)); EnqueueToDbContext(DbContext.ExecCommandInfoType.Insert, CreateEntityState(data));
Attach(data); Attach(data);
if (_db.Options.EnableAddOrUpdateNavigateList) if (_db.Options.EnableAddOrUpdateNavigateList)
await AddOrUpdateNavigateListAsync(data); await AddOrUpdateNavigateListAsync(data, true);
} }
public Task AddAsync(TEntity data) => AddPrivAsync(data, true); public Task AddAsync(TEntity data) => AddPrivAsync(data, true);
async public Task AddRangeAsync(IEnumerable<TEntity> data) async public Task AddRangeAsync(IEnumerable<TEntity> data)
@ -107,7 +107,7 @@ namespace FreeSql
AttachRange(rets); AttachRange(rets);
if (_db.Options.EnableAddOrUpdateNavigateList) if (_db.Options.EnableAddOrUpdateNavigateList)
foreach (var item in data) foreach (var item in data)
await AddOrUpdateNavigateListAsync(item); await AddOrUpdateNavigateListAsync(item, true);
return; return;
default: default:
foreach (var s in data) foreach (var s in data)
@ -123,10 +123,10 @@ namespace FreeSql
AttachRange(data); AttachRange(data);
if (_db.Options.EnableAddOrUpdateNavigateList) if (_db.Options.EnableAddOrUpdateNavigateList)
foreach (var item in data) foreach (var item in data)
await AddOrUpdateNavigateListAsync(item); await AddOrUpdateNavigateListAsync(item, true);
} }
} }
async Task AddOrUpdateNavigateListAsync(TEntity item) async Task AddOrUpdateNavigateListAsync(TEntity item, bool isAdd)
{ {
Type itemType = null; Type itemType = null;
foreach (var prop in _table.Properties) foreach (var prop in _table.Properties)
@ -164,7 +164,7 @@ namespace FreeSql
var propValEach = propVal as IEnumerable; var propValEach = propVal as IEnumerable;
if (propValEach == null) continue; if (propValEach == null) continue;
DbSet<object> refSet = _db.Set<object>().AsType(tref.RefEntityType); DbSet<object> refSet = GetDbSetObject(tref.RefEntityType);
switch (tref.RefType) switch (tref.RefType)
{ {
case Internal.Model.TableRefType.ManyToMany: case Internal.Model.TableRefType.ManyToMany:
@ -197,10 +197,16 @@ namespace FreeSql
} }
else //保存 else //保存
{ {
var midSet = _db.Set<object>().AsType(tref.RefMiddleEntityType); var midSet = GetDbSetObject(tref.RefMiddleEntityType);
List<object> midList = null;
if (isAdd == false)
{
var midSelect = midSet.Select; var midSelect = midSet.Select;
foreach (var midWhere in midWheres) midSelect.Where(midWhere); foreach (var midWhere in midWheres) midSelect.Where(midWhere);
var midList = await midSelect.ToListAsync(); midList = await midSelect.ToListAsync();
}
else
midList = new List<object>();
var midListDel = new List<object>(); var midListDel = new List<object>();
var midListAdd = new List<object>(); var midListAdd = new List<object>();
@ -350,7 +356,7 @@ namespace FreeSql
} }
if (_db.Options.EnableAddOrUpdateNavigateList) if (_db.Options.EnableAddOrUpdateNavigateList)
foreach (var item in data) foreach (var item in data)
await AddOrUpdateNavigateListAsync(item); await AddOrUpdateNavigateListAsync(item, false);
} }
#endregion #endregion

33
FreeSql.DbContext/DbSet/DbSetSync.cs
View File

@ -47,7 +47,7 @@ namespace FreeSql
_db.Orm.SetEntityIdentityValueWithPrimary(_entityType, data, idtval); _db.Orm.SetEntityIdentityValueWithPrimary(_entityType, data, idtval);
Attach(data); Attach(data);
if (_db.Options.EnableAddOrUpdateNavigateList) if (_db.Options.EnableAddOrUpdateNavigateList)
AddOrUpdateNavigateList(data); AddOrUpdateNavigateList(data, true);
} }
else else
{ {
@ -57,7 +57,7 @@ namespace FreeSql
_db.Orm.MapEntityValue(_entityType, newval, data); _db.Orm.MapEntityValue(_entityType, newval, data);
Attach(newval); Attach(newval);
if (_db.Options.EnableAddOrUpdateNavigateList) if (_db.Options.EnableAddOrUpdateNavigateList)
AddOrUpdateNavigateList(data); AddOrUpdateNavigateList(data, true);
} }
return; return;
default: default:
@ -69,7 +69,7 @@ namespace FreeSql
_db.Orm.SetEntityIdentityValueWithPrimary(_entityType, data, idtval); _db.Orm.SetEntityIdentityValueWithPrimary(_entityType, data, idtval);
Attach(data); Attach(data);
if (_db.Options.EnableAddOrUpdateNavigateList) if (_db.Options.EnableAddOrUpdateNavigateList)
AddOrUpdateNavigateList(data); AddOrUpdateNavigateList(data, true);
} }
return; return;
} }
@ -77,7 +77,7 @@ namespace FreeSql
EnqueueToDbContext(DbContext.ExecCommandInfoType.Insert, CreateEntityState(data)); EnqueueToDbContext(DbContext.ExecCommandInfoType.Insert, CreateEntityState(data));
Attach(data); Attach(data);
if (_db.Options.EnableAddOrUpdateNavigateList) if (_db.Options.EnableAddOrUpdateNavigateList)
AddOrUpdateNavigateList(data); AddOrUpdateNavigateList(data, true);
} }
/// <summary> /// <summary>
/// 添加 /// 添加
@ -111,7 +111,7 @@ namespace FreeSql
AttachRange(rets); AttachRange(rets);
if (_db.Options.EnableAddOrUpdateNavigateList) if (_db.Options.EnableAddOrUpdateNavigateList)
foreach (var item in data) foreach (var item in data)
AddOrUpdateNavigateList(item); AddOrUpdateNavigateList(item, true);
return; return;
default: default:
foreach (var s in data) foreach (var s in data)
@ -127,11 +127,16 @@ namespace FreeSql
AttachRange(data); AttachRange(data);
if (_db.Options.EnableAddOrUpdateNavigateList) if (_db.Options.EnableAddOrUpdateNavigateList)
foreach (var item in data) foreach (var item in data)
AddOrUpdateNavigateList(item); AddOrUpdateNavigateList(item, true);
} }
} }
static ConcurrentDictionary<Type, ConcurrentDictionary<string, FieldInfo>> _dicLazyIsSetField = new ConcurrentDictionary<Type, ConcurrentDictionary<string, FieldInfo>>(); static ConcurrentDictionary<Type, ConcurrentDictionary<string, FieldInfo>> _dicLazyIsSetField = new ConcurrentDictionary<Type, ConcurrentDictionary<string, FieldInfo>>();
void AddOrUpdateNavigateList(TEntity item) /// <summary>
/// 联级保存导航集合
/// </summary>
/// <param name="item">实体对象</param>
/// <param name="isAdd">是否为新增的实体对象</param>
void AddOrUpdateNavigateList(TEntity item, bool isAdd)
{ {
Type itemType = null; Type itemType = null;
foreach (var prop in _table.Properties) foreach (var prop in _table.Properties)
@ -169,7 +174,7 @@ namespace FreeSql
var propValEach = propVal as IEnumerable; var propValEach = propVal as IEnumerable;
if (propValEach == null) continue; if (propValEach == null) continue;
DbSet<object> refSet = _db.Set<object>().AsType(tref.RefEntityType); DbSet<object> refSet = GetDbSetObject(tref.RefEntityType);
switch (tref.RefType) switch (tref.RefType)
{ {
case Internal.Model.TableRefType.ManyToMany: case Internal.Model.TableRefType.ManyToMany:
@ -202,10 +207,16 @@ namespace FreeSql
} }
else //保存 else //保存
{ {
var midSet = _db.Set<object>().AsType(tref.RefMiddleEntityType); var midSet = GetDbSetObject(tref.RefMiddleEntityType);
List<object> midList = null;
if (isAdd == false)
{
var midSelect = midSet.Select; var midSelect = midSet.Select;
foreach (var midWhere in midWheres) midSelect.Where(midWhere); foreach (var midWhere in midWheres) midSelect.Where(midWhere);
var midList = midSelect.ToList(); midList = midSelect.ToList();
}
else
midList = new List<object>();
var midListDel = new List<object>(); var midListDel = new List<object>();
var midListAdd = new List<object>(); var midListAdd = new List<object>();
@ -361,7 +372,7 @@ namespace FreeSql
} }
if (_db.Options.EnableAddOrUpdateNavigateList) if (_db.Options.EnableAddOrUpdateNavigateList)
foreach (var item in data) foreach (var item in data)
AddOrUpdateNavigateList(item); AddOrUpdateNavigateList(item, false);
} }
#endregion #endregion

7
FreeSql.DbContext/FreeSql.DbContext.xml
View File

@ -90,6 +90,13 @@
</summary> </summary>
<param name="data"></param> <param name="data"></param>
</member> </member>
<member name="M:FreeSql.DbSet`1.AddOrUpdateNavigateList(`0,System.Boolean)">
<summary>
联级保存导航集合
</summary>
<param name="item">实体对象</param>
<param name="isAdd">是否为新增的实体对象</param>
</member>
<member name="M:FreeSql.DbSet`1.Update(`0)"> <member name="M:FreeSql.DbSet`1.Update(`0)">
<summary> <summary>
更新 更新