tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 02:32:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 优化 AOT 默认导致 Enum.GetValues 报错的问题；#1691

Browse Source
This commit is contained in:
2881099 2023-12-17 12:31:15 +08:00
parent 29e3635f1b
commit 231d5ac555
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
FreeSql/Internal/UtilsExpressionTree.cs
View File

@ -252,16 +252,21 @@ namespace FreeSql.Internal
if (entityDefault != null) defaultValue = trytb.Properties[csName].GetValue(entityDefault, null); if (entityDefault != null) defaultValue = trytb.Properties[csName].GetValue(entityDefault, null);
if (defaultValue != null && mapType.IsEnum) if (defaultValue != null && mapType.IsEnum)
{ {
var isEqualsEnumValue = false; Array enumValues = null;
var enumValues = Enum.GetValues(mapType); try { enumValues = Enum.GetValues(mapType); } //AOT error
for (var a = 0; a < enumValues.Length; a++) catch { }
if (object.Equals(defaultValue, enumValues.GetValue(a))) if (enumValues != null)
{ {
isEqualsEnumValue = true; var isEqualsEnumValue = false;
break; for (var a = 0; a < enumValues.Length; a++)
} if (object.Equals(defaultValue, enumValues.GetValue(a)))
if (isEqualsEnumValue == false && enumValues.Length > 0) {
defaultValue = enumValues.GetValue(0); isEqualsEnumValue = true;
break;
}
if (isEqualsEnumValue == false && enumValues.Length > 0)
defaultValue = enumValues.GetValue(0);
}
} }
if (defaultValue != null && mapType != colattr.MapType) defaultValue = Utils.GetDataReaderValue(colattr.MapType, defaultValue); if (defaultValue != null && mapType != colattr.MapType) defaultValue = Utils.GetDataReaderValue(colattr.MapType, defaultValue);
if (defaultValue == null) defaultValue = tp?.defaultValue; if (defaultValue == null) defaultValue = tp?.defaultValue;