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

fix: 修复实体对象无空构造函数时通过Repository操作引发异常的问题,增加Lazy改进并发

Browse Source
This commit is contained in:
xuna
2022-07-26 20:06:26 +08:00
parent aba2e14c5d
commit c33d8c6d39
5 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,7 +219,7 @@ namespace FreeSql
public DbSet<TEntity> AttachOnlyPrimary(TEntity data)
{
if (data == null) return this;
var pkitem = (TEntity)Activator.CreateInstance(_entityType);
var pkitem = (TEntity)_entityType.CreateInstanceGetDefaultValue();
foreach (var pk in _db.OrmOriginal.CodeFirst.GetTableByEntity(_entityType).Primarys)
{
var colVal = _db.OrmOriginal.GetEntityValueWithPropertyName(_entityType, data, pk.CsName);
@ -267,8 +267,8 @@ namespace FreeSql
{
if (data == null) throw new ArgumentNullException(nameof(data));
var key = _db.OrmOriginal.GetEntityKeyString(_entityType, data, false);
var state = new EntityState((TEntity)Activator.CreateInstance(_entityType), key);
_db.OrmOriginal.MapEntityValue(_entityType, data, state.Value);
var state = new EntityState((TEntity)_entityType.CreateInstanceGetDefaultValue(), key);
_db.OrmOriginal.MapEntityValue(_entityType, data, state.Value);
return state;
}
bool? ExistsInStates(TEntity data)

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

@ -312,7 +312,7 @@ namespace FreeSql
midSet.RemoveRange(midListDel); //删除未保存的项
foreach (var curItem in curList)
{
var newItem = Activator.CreateInstance(tref.RefMiddleEntityType);
var newItem = tref.RefMiddleEntityType.CreateInstanceGetDefaultValue();
for (var colidx = 0; colidx < tref.Columns.Count; colidx++)
{
var val = FreeSql.Internal.Utils.GetDataReaderValue(tref.MiddleColumns[colidx].CsType, _db.OrmOriginal.GetEntityValueWithPropertyName(_table.Type, item, tref.Columns[colidx].CsName));

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

@ -323,7 +323,7 @@ namespace FreeSql
midSet.RemoveRange(midListDel); //删除未保存的项
foreach (var curItem in curList)
{
var newItem = Activator.CreateInstance(tref.RefMiddleEntityType);
var newItem = tref.RefMiddleEntityType.CreateInstanceGetDefaultValue();
for (var colidx = 0; colidx < tref.Columns.Count; colidx++)
{
var val = FreeSql.Internal.Utils.GetDataReaderValue(tref.MiddleColumns[colidx].CsType, _db.OrmOriginal.GetEntityValueWithPropertyName(_table.Type, item, tref.Columns[colidx].CsName));

2
FreeSql.DbContext/Repository/Repository/BaseRepository.cs
View File

@ -197,7 +197,7 @@ namespace FreeSql
var tb = _db.OrmOriginal.CodeFirst.GetTableByEntity(EntityType);
if (tb.Primarys.Length != 1) throw new Exception(DbContextStrings.EntityType_PrimaryKeyIsNotOne(EntityType.Name));
if (tb.Primarys[0].CsType.NullableTypeOrThis() != typeof(TKey).NullableTypeOrThis()) throw new Exception(DbContextStrings.EntityType_PrimaryKeyError(EntityType.Name, typeof(TKey).FullName));
var obj = Activator.CreateInstance(tb.Type);
var obj = tb.Type.CreateInstanceGetDefaultValue();
_db.OrmOriginal.SetEntityValueWithPropertyName(tb.Type, obj, tb.Primarys[0].CsName, id);
var ret = obj as TEntity;
if (ret == null) throw new Exception(DbContextStrings.EntityType_CannotConvert(EntityType.Name, typeof(TEntity).Name));