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

- 优化 DbContext/Repository 局部调整；

Browse Source
This commit is contained in:
28810
2019-08-13 19:13:48 +08:00
parent 79ab3ae217
commit a79ee52b4f
14 changed files with 211 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ namespace FreeSql
Task DbContextExecCommandAsync()
{
_dicUpdateTimes.Clear();
return _ctx.ExecCommandAsync();
return _db.ExecCommandAsync();
}
async Task<int> DbContextBetchAddAsync(EntityState[] adds)
@ -31,7 +31,7 @@ namespace FreeSql
if (_tableIdentitys.Length > 0)
{
//有自增，马上执行
switch (_fsql.Ado.DataType)
switch (_db.Orm.Ado.DataType)
{
case DataType.SqlServer:
case DataType.PostgreSQL:
@ -40,9 +40,9 @@ namespace FreeSql
await DbContextExecCommandAsync();
var idtval = await this.OrmInsert(data).ExecuteIdentityAsync();
IncrAffrows(1);
_fsql.SetEntityIdentityValueWithPrimary(_entityType, data, idtval);
_db.Orm.SetEntityIdentityValueWithPrimary(_entityType, data, idtval);
Attach(data);
if (_ctx.Options.EnableAddOrUpdateNavigateList)
if (_db.Options.EnableAddOrUpdateNavigateList)
await AddOrUpdateNavigateListAsync(data);
}
else
@ -50,9 +50,9 @@ namespace FreeSql
await DbContextExecCommandAsync();
var newval = (await this.OrmInsert(data).ExecuteInsertedAsync()).First();
IncrAffrows(1);
_fsql.MapEntityValue(_entityType, newval, data);
_db.Orm.MapEntityValue(_entityType, newval, data);
Attach(newval);
if (_ctx.Options.EnableAddOrUpdateNavigateList)
if (_db.Options.EnableAddOrUpdateNavigateList)
await AddOrUpdateNavigateListAsync(data);
}
return;
@ -64,9 +64,9 @@ namespace FreeSql
await DbContextExecCommandAsync();
var idtval = await this.OrmInsert(data).ExecuteIdentityAsync();
IncrAffrows(1);
_fsql.SetEntityIdentityValueWithPrimary(_entityType, data, idtval);
_db.Orm.SetEntityIdentityValueWithPrimary(_entityType, data, idtval);
Attach(data);
if (_ctx.Options.EnableAddOrUpdateNavigateList)
if (_db.Options.EnableAddOrUpdateNavigateList)
await AddOrUpdateNavigateListAsync(data);
}
return;
@ -74,7 +74,7 @@ namespace FreeSql
}
EnqueueToDbContext(DbContext.ExecCommandInfoType.Insert, CreateEntityState(data));
Attach(data);
if (_ctx.Options.EnableAddOrUpdateNavigateList)
if (_db.Options.EnableAddOrUpdateNavigateList)
await AddOrUpdateNavigateListAsync(data);
}
public Task AddAsync(TEntity data) => AddPrivAsync(data, true);
@ -89,19 +89,19 @@ namespace FreeSql
if (_tableIdentitys.Length > 0)
{
//有自增，马上执行
switch (_fsql.Ado.DataType)
switch (_db.Orm.Ado.DataType)
{
case DataType.SqlServer:
case DataType.PostgreSQL:
await DbContextExecCommandAsync();
var rets = await this.OrmInsert(data).ExecuteInsertedAsync();
if (rets.Count != data.Count()) throw new Exception($"特别错误：批量添加失败，{_fsql.Ado.DataType} 的返回数据，与添加的数目不匹配");
if (rets.Count != data.Count()) throw new Exception($"特别错误：批量添加失败，{_db.Orm.Ado.DataType} 的返回数据，与添加的数目不匹配");
var idx = 0;
foreach (var s in data)
_fsql.MapEntityValue(_entityType, rets[idx++], s);
_db.Orm.MapEntityValue(_entityType, rets[idx++], s);
IncrAffrows(rets.Count);
AttachRange(rets);
if (_ctx.Options.EnableAddOrUpdateNavigateList)
if (_db.Options.EnableAddOrUpdateNavigateList)
foreach (var item in data)
await AddOrUpdateNavigateListAsync(item);
return;
@ -119,7 +119,7 @@ namespace FreeSql
foreach (var item in data)
EnqueueToDbContext(DbContext.ExecCommandInfoType.Insert, CreateEntityState(item));
AttachRange(data);
if (_ctx.Options.EnableAddOrUpdateNavigateList)
if (_db.Options.EnableAddOrUpdateNavigateList)
foreach (var item in data)
await AddOrUpdateNavigateListAsync(item);
}
@ -161,7 +161,7 @@ namespace FreeSql
{
if (dbset == null)
{
dbset = _ctx.Set(tref.RefEntityType);
dbset = _db.Set(tref.RefEntityType);
dbsetAddOrUpdate = dbset.GetType().GetMethod("AddOrUpdateAsync", new Type[] { tref.RefEntityType });
}
for (var colidx = 0; colidx < tref.Columns.Count; colidx++)
@ -189,10 +189,10 @@ namespace FreeSql
if (_states.TryGetValue(uplst1.Key, out var lstval1) == false) return -999;
var lstval2 = default(EntityState);
if (uplst2 != null && _states.TryGetValue(uplst2.Key, out lstval2) == false) throw new Exception($"特别错误：更新失败，数据未被跟踪：{_fsql.GetEntityString(_entityType, uplst2.Value)}");
if (uplst2 != null && _states.TryGetValue(uplst2.Key, out lstval2) == false) throw new Exception($"特别错误：更新失败，数据未被跟踪：{_db.Orm.GetEntityString(_entityType, uplst2.Value)}");
var cuig1 = _fsql.CompareEntityValueReturnColumns(_entityType, uplst1.Value, lstval1.Value, true);
var cuig2 = uplst2 != null ? _fsql.CompareEntityValueReturnColumns(_entityType, uplst2.Value, lstval2.Value, true) : null;
var cuig1 = _db.Orm.CompareEntityValueReturnColumns(_entityType, uplst1.Value, lstval1.Value, true);
var cuig2 = uplst2 != null ? _db.Orm.CompareEntityValueReturnColumns(_entityType, uplst2.Value, lstval2.Value, true) : null;
List<EntityState> data = null;
string[] cuig = null;
@ -224,9 +224,9 @@ namespace FreeSql
foreach (var newval in data)
{
if (_states.TryGetValue(newval.Key, out var tryold))
_fsql.MapEntityValue(_entityType, newval.Value, tryold.Value);
_db.Orm.MapEntityValue(_entityType, newval.Value, tryold.Value);
if (newval.OldValue != null)
_fsql.MapEntityValue(_entityType, newval.Value, newval.OldValue);
_db.Orm.MapEntityValue(_entityType, newval.Value, newval.OldValue);
}
return affrows;
}
@ -237,11 +237,11 @@ namespace FreeSql
async public Task UpdateAsync(TEntity data)
{
var exists = ExistsInStates(data);
if (exists == null) throw new Exception($"不可更新，未设置主键的值：{_fsql.GetEntityString(_entityType, data)}");
if (exists == null) throw new Exception($"不可更新，未设置主键的值：{_db.Orm.GetEntityString(_entityType, data)}");
if (exists == false)
{
var olddata = await OrmSelect(data).FirstAsync();
if (olddata == null) throw new Exception($"不可更新，数据库不存在该记录：{_fsql.GetEntityString(_entityType, data)}");
if (olddata == null) throw new Exception($"不可更新，数据库不存在该记录：{_db.Orm.GetEntityString(_entityType, data)}");
}
await UpdateRangePrivAsync(new[] { data }, true);
@ -260,7 +260,7 @@ namespace FreeSql
state.OldValue = item;
EnqueueToDbContext(DbContext.ExecCommandInfoType.Update, state);
}
if (_ctx.Options.EnableAddOrUpdateNavigateList)
if (_db.Options.EnableAddOrUpdateNavigateList)
foreach (var item in data)
await AddOrUpdateNavigateListAsync(item);
}
@ -279,7 +279,7 @@ namespace FreeSql
async public Task AddOrUpdateAsync(TEntity data)
{
if (data == null) throw new ArgumentNullException(nameof(data));
if (_table.Primarys.Any() == false) throw new Exception($"不可添加，实体没有主键：{_fsql.GetEntityString(_entityType, data)}");
if (_table.Primarys.Any() == false) throw new Exception($"不可添加，实体没有主键：{_db.Orm.GetEntityString(_entityType, data)}");
var flagExists = ExistsInStates(data);
if (flagExists == false)
@ -291,15 +291,15 @@ namespace FreeSql
if (flagExists == true && CanUpdate(data, false))
{
await DbContextExecCommandAsync();
var affrows = _ctx._affrows;
var affrows = _db._affrows;
await UpdateRangePrivAsync(new[] { data }, false);
await DbContextExecCommandAsync();
affrows = _ctx._affrows - affrows;
affrows = _db._affrows - affrows;
if (affrows > 0) return;
}
if (CanAdd(data, false))
{
_fsql.ClearEntityPrimaryValueWithIdentity(_entityType, data);
_db.Orm.ClearEntityPrimaryValueWithIdentity(_entityType, data);
await AddPrivAsync(data, false);
}
}