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

- 优化 ReadAnonymous 映射类型不一致的容错；

Browse Source
This commit is contained in:
28810
2019-11-29 17:56:06 +08:00
parent bfed0cd124
commit 27f053f00b
8 changed files with 395 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
FreeSql/Internal/CommonExpression.cs
View File

@ -124,7 +124,7 @@ namespace FreeSql.Internal
{
Property = dtoProp,
CsName = dtoProp.Name,
CsType = dtoProp.PropertyType,
CsType = trydtocol.CsType, // dtoProp.PropertyType,
MapType = trydtocol.Attribute.MapType
};
parent.Childs.Add(child);
@ -195,7 +195,7 @@ namespace FreeSql.Internal
{
Property = dtoProp,
CsName = dtoProp.Name,
CsType = dtoProp.PropertyType,
CsType = trydtocol.CsType, //dtoProp.PropertyType,
MapType = trydtocol.Attribute.MapType
};
parent.Childs.Add(child);
@ -227,11 +227,17 @@ namespace FreeSql.Internal
if (notRead)
{
++index;
if (parent.Property != null)
return Utils.GetDataReaderValue(parent.Property.PropertyType, null);
return Utils.GetDataReaderValue(parent.CsType, null);
}
if (parent.CsType == parent.MapType)
return Utils.GetDataReaderValue(parent.CsType, dr.GetValue(++index));
return Utils.GetDataReaderValue(parent.CsType, Utils.GetDataReaderValue(parent.MapType, dr.GetValue(++index)));
object objval = dr.GetValue(++index);
if (parent.CsType != parent.MapType)
objval = Utils.GetDataReaderValue(parent.MapType, objval);
objval = Utils.GetDataReaderValue(parent.CsType, objval);
if (parent.Property != null && parent.CsType != parent.Property.PropertyType)
objval = Utils.GetDataReaderValue(parent.Property.PropertyType, objval);
return objval;
}
switch (parent.ConsturctorType)
{