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

修复 FreeSql.DbContext 当插入实体带 Guid 主键无值时候的 bug

Browse Source
This commit is contained in:
28810 2019-03-30 19:51:14 +08:00
parent a7e06843a9
commit 3ca91b70a9
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,8 +89,8 @@ namespace FreeSql {
} }
} else { } else {
//进入队列，等待 SaveChanges 时执行 //进入队列，等待 SaveChanges 时执行
foreach (var s in data) foreach (var item in data)
EnqueueToDbContext(DbContext.ExecCommandInfoType.Insert, CreateEntityState(s)); EnqueueToDbContext(DbContext.ExecCommandInfoType.Insert, CreateEntityState(item));
} }
} }
#endregion #endregion

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

@ -87,8 +87,8 @@ namespace FreeSql {
} }
} else { } else {
//进入队列，等待 SaveChanges 时执行 //进入队列，等待 SaveChanges 时执行
foreach (var s in data) foreach (var item in data)
EnqueueToDbContext(DbContext.ExecCommandInfoType.Insert, CreateEntityState(s)); EnqueueToDbContext(DbContext.ExecCommandInfoType.Insert, CreateEntityState(item));
} }
} }
#endregion #endregion

20
FreeSql/Extensions/EntityUtilExtensions.cs
View File

@ -13,10 +13,11 @@ namespace FreeSql.Extensions.EntityUtil {
static MethodInfo MethodStringBuilderToString = typeof(StringBuilder).GetMethod("ToString", new Type[0]); static MethodInfo MethodStringBuilderToString = typeof(StringBuilder).GetMethod("ToString", new Type[0]);
static PropertyInfo MethodStringBuilderLength = typeof(StringBuilder).GetProperty("Length"); static PropertyInfo MethodStringBuilderLength = typeof(StringBuilder).GetProperty("Length");
static MethodInfo MethodStringConcat = typeof(string).GetMethod("Concat", new Type[] { typeof(object) }); static MethodInfo MethodStringConcat = typeof(string).GetMethod("Concat", new Type[] { typeof(object) });
static MethodInfo MethodFreeUtilNewMongodbId = typeof(FreeUtil).GetMethod("NewMongodbId");
static ConcurrentDictionary<DataType, ConcurrentDictionary<Type, Func<object, string>>> _dicGetEntityKeyString = new ConcurrentDictionary<DataType, ConcurrentDictionary<Type, Func<object, string>>>(); static ConcurrentDictionary<DataType, ConcurrentDictionary<Type, Func<object, string>>> _dicGetEntityKeyString = new ConcurrentDictionary<DataType, ConcurrentDictionary<Type, Func<object, string>>>();
/// <summary> /// <summary>
/// 获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值，返回 null /// 获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值时（当Guid无值时，会生成有序的新值），返回 null
/// </summary> /// </summary>
/// <typeparam name="TEntity"></typeparam> /// <typeparam name="TEntity"></typeparam>
/// <param name="_table"></param> /// <param name="_table"></param>
@ -37,12 +38,27 @@ namespace FreeSql.Extensions.EntityUtil {
Expression.Assign(var3IsNull, Expression.Constant(false)) Expression.Assign(var3IsNull, Expression.Constant(false))
}); });
for (var a = 0; a < pks.Length; a++) { for (var a = 0; a < pks.Length; a++) {
var isguid = pks[a].CsType.NullableTypeOrThis() == typeof(Guid);
Expression expthen = null;
if (isguid == false)
expthen = Expression.Assign(var3IsNull, Expression.Constant(true));
else {
expthen = Expression.Block(
new Expression[]{
Expression.Assign(Expression.MakeMemberAccess(var1Parm, _table.Properties[pks[a].CsName]), Expression.Call(MethodFreeUtilNewMongodbId)),
a > 0 ? Expression.Call(var2Sb, MethodStringBuilderAppend, Expression.Constant(splitString)) : null,
Expression.Call(var2Sb, MethodStringBuilderAppend,
Expression.Convert(Expression.MakeMemberAccess(var1Parm, _table.Properties[pks[a].CsName]), typeof(object))
)
}.Where(c => c != null).ToArray()
);
}
exps.Add( exps.Add(
Expression.IfThen( Expression.IfThen(
Expression.IsFalse(var3IsNull), Expression.IsFalse(var3IsNull),
Expression.IfThenElse( Expression.IfThenElse(
Expression.Equal(Expression.MakeMemberAccess(var1Parm, _table.Properties[pks[a].CsName]), Expression.Default(pks[a].CsType)), Expression.Equal(Expression.MakeMemberAccess(var1Parm, _table.Properties[pks[a].CsName]), Expression.Default(pks[a].CsType)),
Expression.Assign(var3IsNull, Expression.Constant(true)), expthen,
Expression.Block( Expression.Block(
new Expression[]{ new Expression[]{
a > 0 ? Expression.Call(var2Sb, MethodStringBuilderAppend, Expression.Constant(splitString)) : null, a > 0 ? Expression.Call(var2Sb, MethodStringBuilderAppend, Expression.Constant(splitString)) : null,