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

- 优化 DbContext/Repository Update 实体有 ServerTime 既使无状态变化也必然更新的逻辑；

Browse Source
This commit is contained in:
2881099
2022-04-12 21:44:31 +08:00
parent 46ad51c7e0
commit 91522386b1
5 changed files with 60 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
FreeSql/Extensions/EntityUtilExtensions.cs
View File

@ -604,7 +604,15 @@ namespace FreeSql.Extensions.EntityUtil
exps.Add(Expression.Label(returnTarget, Expression.Constant(new string[0])));
return Expression.Lambda<Func<object, object, bool, string[]>>(Expression.Block(new[] { var1Ret, var1Parm, var2Parm }, exps), new[] { parm1, parm2, parm3 }).Compile();
});
return func(entity1, entity2, isEqual);
var result = func(entity1, entity2, isEqual);
var tmptb = orm.CodeFirst.GetTableByEntity(entityType);
if (tmptb.ColumnsByCanUpdateDbUpdateValue.Length > 0) {
if (isEqual && result.Length + tmptb.ColumnsByCanUpdateDbUpdateValue.Length == tmptb.ColumnsByCs.Count)
return result.Concat(tmptb.ColumnsByCanUpdateDbUpdateValue.Select(a => a.Attribute.Name)).ToArray();
if (!isEqual && result.Length == tmptb.ColumnsByCanUpdateDbUpdateValue.Length)
return new string[0];
}
return result;
}
static ConcurrentDictionary<DataType, ConcurrentDictionary<Type, Action<object, string, int>>> _dicSetEntityIncrByWithPropertyName = new ConcurrentDictionary<DataType, ConcurrentDictionary<Type, Action<object, string, int>>>();

1
FreeSql/Internal/Model/TableInfo.cs
View File

@ -17,6 +17,7 @@ namespace FreeSql.Internal.Model
public Dictionary<string, ColumnInfo> ColumnsByCs { get; set; } = new Dictionary<string, ColumnInfo>(StringComparer.CurrentCultureIgnoreCase);
public Dictionary<string, ColumnInfo> ColumnsByCsIgnore { get; set; } = new Dictionary<string, ColumnInfo>(StringComparer.CurrentCultureIgnoreCase);
public ColumnInfo[] ColumnsByPosition { get; set; }
public ColumnInfo[] ColumnsByCanUpdateDbUpdateValue { get; set; }
public ColumnInfo[] Primarys { get; set; }
public IndexInfo[] Indexes { get; set; }
public string CsName { get; set; }

1
FreeSql/Internal/UtilsExpressionTree.cs
View File

@ -484,6 +484,7 @@ namespace FreeSql.Internal
trytb.ColumnsByPosition = columnsList.Where(a => a.Attribute.Position > 0).OrderBy(a => a.Attribute.Position)
.Concat(columnsList.Where(a => a.Attribute.Position == 0))
.Concat(columnsList.Where(a => a.Attribute.Position < 0).OrderBy(a => a.Attribute.Position)).ToArray();
trytb.ColumnsByCanUpdateDbUpdateValue = columnsList.Where(a => a.Attribute.CanUpdate == true && string.IsNullOrEmpty(a.DbUpdateValue) == false).ToArray();
trytb.Primarys = trytb.Columns.Values.Where(a => a.Attribute.IsPrimary == true).ToArray();
if (trytb.Primarys.Any() == false)