- 调整 DbContext.EntityChangeInfo 类名为 DbContext.EntityChangeReport.ChangeInfo;

- 调整 IUnitOfWork 接口,移除 OnEntityChange 属性,增加 EntityChangeReport 属性;
This commit is contained in:
28810
2019-10-15 19:18:31 +08:00
parent 375ba5f3cb
commit d7877924a5
9 changed files with 60 additions and 50 deletions

View File

@ -59,16 +59,12 @@ namespace FreeSql
int ret;
try
{
if (UnitOfWork == null) EmitOnEntityChange(_entityChangeReport);
else
if (UnitOfWork?.EntityChangeReport != null)
{
var uow = UnitOfWork as UnitOfWork;
if (uow != null)
{
uow.EntityChangeReport.AddRange(_entityChangeReport);
if (uow.OnEntityChange == null) uow.OnEntityChange = Options.OnEntityChange;
}
}
UnitOfWork.EntityChangeReport.Report.AddRange(_entityChangeReport);
if (UnitOfWork.EntityChangeReport.OnChange == null) UnitOfWork.EntityChangeReport.OnChange = Options.OnEntityChange;
} else
EmitOnEntityChange(_entityChangeReport);
}
finally
{

View File

@ -75,7 +75,7 @@ namespace FreeSql
var delete = _dbset.OrmDeleteInternal(null).Where(predicate);
var sql = delete.ToSql();
var affrows = delete.ExecuteAffrows();
_db._entityChangeReport.Add(new DbContext.EntityChangeInfo { Object = sql, Type = DbContext.EntityChangeType.SqlRaw });
_db._entityChangeReport.Add(new DbContext.EntityChangeReport.ChangeInfo { Object = sql, Type = DbContext.EntityChangeType.SqlRaw });
return affrows;
}
async public Task<int> DeleteAsync(Expression<Func<TEntity, bool>> predicate)
@ -83,7 +83,7 @@ namespace FreeSql
var delete = _dbset.OrmDeleteInternal(null).Where(predicate);
var sql = delete.ToSql();
var affrows = await delete.ExecuteAffrowsAsync();
_db._entityChangeReport.Add(new DbContext.EntityChangeInfo { Object = sql, Type = DbContext.EntityChangeType.SqlRaw });
_db._entityChangeReport.Add(new DbContext.EntityChangeReport.ChangeInfo { Object = sql, Type = DbContext.EntityChangeType.SqlRaw });
return affrows;
}