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

修复 .ToList(a => a.id) 当 id 是 guid 类型时，会出现类型转换失败 bug；

Browse Source
This commit is contained in:
28810
2019-04-11 12:30:54 +08:00
parent 8da9474013
commit b5c79204d8
8 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
FreeSql/Internal/CommonExpression.cs
View File

@ -66,13 +66,15 @@ namespace FreeSql.Internal {
for (var idx = 0; idx < map.Count; idx++) {
var child = new ReadAnonymousTypeInfo {
Property = tb.Properties.TryGetValue(map[idx].Column.CsName, out var tryprop) ? tryprop : tb.Type.GetProperty(map[idx].Column.CsName, BindingFlags.Public | BindingFlags.IgnoreCase | BindingFlags.Instance),
CsName = map[idx].Column.CsName, DbField = $"{map[idx].Table.Alias}.{_common.QuoteSqlName(map[idx].Column.Attribute.Name)}"
CsName = map[idx].Column.CsName, DbField = $"{map[idx].Table.Alias}.{_common.QuoteSqlName(map[idx].Column.Attribute.Name)}",
CsType = map[idx].Column.CsType
};
field.Append(", ").Append(_common.QuoteReadColumn(map[idx].Column.CsType, child.DbField));
if (index >= 0) field.Append(" as").Append(++index);
parent.Childs.Add(child);
}
} else {
parent.CsType = exp.Type;
parent.DbField = ExpressionLambdaToSql(exp, _tables, null, getSelectGroupingMapString, SelectTableInfoType.From, true, false, ExpressionStyle.Where);
field.Append(", ").Append(parent.DbField);
if (index >= 0) field.Append(" as").Append(++index);
@ -157,9 +159,9 @@ namespace FreeSql.Internal {
if (parent.Childs.Any() == false) {
if (notRead) {
++index;
return null;
return Utils.GetDataReaderValue(parent.CsType, null);
}
return dr.GetValue(++index);
return Utils.GetDataReaderValue(parent.CsType, dr.GetValue(++index));
}
switch (parent.ConsturctorType) {
case ReadAnonymousTypeInfoConsturctorType.Arguments:
@ -167,7 +169,7 @@ namespace FreeSql.Internal {
for (var a = 0; a < parent.Childs.Count; a++) {
var objval = ReadAnonymous(parent.Childs[a], dr, ref index, notRead);
if (notRead == false)
args[a] = Utils.GetDataReaderValue(parent.Childs[a].CsType, objval);
args[a] = objval;
}
return parent.Consturctor.Invoke(args);
case ReadAnonymousTypeInfoConsturctorType.Properties:
@ -176,11 +178,10 @@ namespace FreeSql.Internal {
for (var b = 0; b < parent.Childs.Count; b++) {
var prop = parent.Childs[b].Property;
var objval = ReadAnonymous(parent.Childs[b], dr, ref index, notRead);
var safeval = Utils.GetDataReaderValue(prop.PropertyType, objval);
if (isnull == false && safeval == null && parent.Table != null && parent.Table.ColumnsByCs.TryGetValue(parent.Childs[b].CsName, out var trycol) && trycol.Attribute.IsPrimary)
if (isnull == false && objval == null && parent.Table != null && parent.Table.ColumnsByCs.TryGetValue(parent.Childs[b].CsName, out var trycol) && trycol.Attribute.IsPrimary)
isnull = true;
if (isnull == false)
prop.SetValue(ret, safeval, null);
prop.SetValue(ret, objval, null);
}
return isnull ? null : ret;
}

1
FreeSql/Internal/UtilsExpressionTree.cs
View File

@ -1098,6 +1098,7 @@ namespace FreeSql.Internal {
}
public static object GetDataReaderValue(Type type, object value) {
if (value == null || value == DBNull.Value) return null;
if (type == null) return value;
var func = _dicGetDataReaderValue.GetOrAdd(type, k1 => new ConcurrentDictionary<Type, Func<object, object>>()).GetOrAdd(value.GetType(), valueType => {
var parmExp = Expression.Parameter(typeof(object), "value");
var exp = GetDataReaderValueBlockExpression(type, parmExp);