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

愚人节版本

Browse Source
This commit is contained in:
28810
2019-04-01 12:17:59 +08:00
parent be5259dd68
commit da1c6cd4f0
3 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
FreeSql/DataAnnotations/ColumnFluent.cs
View File

@ -55,5 +55,12 @@
_column.IsIgnore = value;
return this;
}
/// <summary>
/// 乐观锁
/// </summary>
public ColumnFluent IsVersion(bool value) {
_column.IsVersion = value;
return this;
}
}
}

32
FreeSql/Extensions/EntityUtilExtensions.cs
View File

@ -53,12 +53,28 @@ namespace FreeSql.Extensions.EntityUtil {
}.Where(c => c != null).ToArray()
);
}
exps.Add(
Expression.IfThen(
Expression.IsFalse(var3IsNull),
Expression.IfThenElse(
Expression.Equal(Expression.MakeMemberAccess(var1Parm, _table.Properties[pks[a].CsName]), Expression.Default(pks[a].CsType)),
expthen,
if (pks[a].Attribute.IsIdentity || isguid || pks[a].CsType == typeof(string) || pks[a].CsType.IsNullableType()) {
exps.Add(
Expression.IfThen(
Expression.IsFalse(var3IsNull),
Expression.IfThenElse(
Expression.Equal(Expression.MakeMemberAccess(var1Parm, _table.Properties[pks[a].CsName]), Expression.Default(pks[a].CsType)),
expthen,
Expression.Block(
new Expression[]{
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()
)
)
)
);
} else {
exps.Add(
Expression.IfThen(
Expression.IsFalse(var3IsNull),
Expression.Block(
new Expression[]{
a > 0 ? Expression.Call(var2Sb, MethodStringBuilderAppend, Expression.Constant(splitString)) : null,
@ -68,8 +84,8 @@ namespace FreeSql.Extensions.EntityUtil {
}.Where(c => c != null).ToArray()
)
)
)
);
);
}
}
exps.Add(
Expression.IfThen(