Merge pull request #2065 from Linlccc/master

2881099 · web-flow · commit 988b4b90be2f · 2025-07-08T15:55:00.000+08:00
fix：修复使用 microsoft.data.sqlite 驱动时，aot 异常
diff --git a/FreeSql/Internal/UtilsExpressionTree.cs b/FreeSql/Internal/UtilsExpressionTree.cs
@@ -2558,7 +2558,7 @@ Expression LocalFuncGetExpression(bool ignoreArray = false)
                                     Expression.Return(returnTarget, Expression.Convert(tryparseVarExp, typeof(object))),
                                     Expression.IfThenElse(
                                         Expression.IsTrue(Expression.Call(MethodDecimalTryParse, Expression.Convert(valueExp, typeof(string)), Expression.Constant(System.Globalization.NumberStyles.Any), Expression.Constant(null, typeof(IFormatProvider)), tryparseVarExpDecimal)),
-                                        Expression.Return(returnTarget, Expression.Convert(Expression.Convert(tryparseVarExpDecimal, tryparseVarExp.Type), typeof(object))),
+                                        Expression.Return(returnTarget, Expression.Call(MethodConvertChangeType,Expression.Convert(tryparseVarExpDecimal,typeof(object)),Expression.Constant(type, typeof(Type)))),
                                         Expression.Return(returnTarget, Expression.Convert(Expression.Default(typeOrg), typeof(object)))
                                     )
                                 )
@@ -2574,7 +2574,7 @@ Expression LocalFuncGetExpression(bool ignoreArray = false)
                                     Expression.Return(returnTarget, Expression.Convert(tryparseVarExp, typeof(object))),
                                     Expression.IfThenElse(
                                         Expression.IsTrue(Expression.Call(MethodDecimalTryParse, Expression.Convert(valueExp, typeof(string)), Expression.Constant(System.Globalization.NumberStyles.Any), Expression.Constant(null, typeof(IFormatProvider)), tryparseVarExpDecimal)),
-                                        Expression.Return(returnTarget, Expression.Convert(Expression.Convert(tryparseVarExpDecimal, tryparseVarExp.Type), typeof(object))),
+                                        Expression.Return(returnTarget, Expression.Call(MethodConvertChangeType,Expression.Convert(tryparseVarExpDecimal,typeof(object)),Expression.Constant(type, typeof(Type)))),
                                         Expression.Return(returnTarget, Expression.Convert(Expression.Default(typeOrg), typeof(object)))
                                     )
                                 )
@@ -2590,7 +2590,7 @@ Expression LocalFuncGetExpression(bool ignoreArray = false)
                                     Expression.Return(returnTarget, Expression.Convert(tryparseVarExp, typeof(object))),
                                     Expression.IfThenElse(
                                         Expression.IsTrue(Expression.Call(MethodDecimalTryParse, Expression.Convert(valueExp, typeof(string)), Expression.Constant(System.Globalization.NumberStyles.Any), Expression.Constant(null, typeof(IFormatProvider)), tryparseVarExpDecimal)),
-                                        Expression.Return(returnTarget, Expression.Convert(Expression.Convert(tryparseVarExpDecimal, tryparseVarExp.Type), typeof(object))),
+                                        Expression.Return(returnTarget, Expression.Call(MethodConvertChangeType,Expression.Convert(tryparseVarExpDecimal,typeof(object)),Expression.Constant(type, typeof(Type)))),
                                         Expression.Return(returnTarget, Expression.Convert(Expression.Default(typeOrg), typeof(object)))
                                     )
                                 )
@@ -2618,7 +2618,7 @@ Expression LocalFuncGetExpression(bool ignoreArray = false)
                                     Expression.Return(returnTarget, Expression.Convert(tryparseVarExp, typeof(object))),
                                     Expression.IfThenElse(
                                         Expression.IsTrue(Expression.Call(MethodDecimalTryParse, Expression.Convert(valueExp, typeof(string)), Expression.Constant(System.Globalization.NumberStyles.Any), Expression.Constant(null, typeof(IFormatProvider)), tryparseVarExpDecimal)),
-                                        Expression.Return(returnTarget, Expression.Convert(Expression.Convert(tryparseVarExpDecimal, tryparseVarExp.Type), typeof(object))),
+                                        Expression.Return(returnTarget, Expression.Call(MethodConvertChangeType,Expression.Convert(tryparseVarExpDecimal,typeof(object)),Expression.Constant(type, typeof(Type)))),
                                         Expression.Return(returnTarget, Expression.Convert(Expression.Default(typeOrg), typeof(object)))
                                     )
                                 )
@@ -2634,7 +2634,7 @@ Expression LocalFuncGetExpression(bool ignoreArray = false)
                                     Expression.Return(returnTarget, Expression.Convert(tryparseVarExp, typeof(object))),
                                     Expression.IfThenElse(
                                         Expression.IsTrue(Expression.Call(MethodDecimalTryParse, Expression.Convert(valueExp, typeof(string)), Expression.Constant(System.Globalization.NumberStyles.Any), Expression.Constant(null, typeof(IFormatProvider)), tryparseVarExpDecimal)),
-                                        Expression.Return(returnTarget, Expression.Convert(Expression.Convert(tryparseVarExpDecimal, tryparseVarExp.Type), typeof(object))),
+                                        Expression.Return(returnTarget, Expression.Call(MethodConvertChangeType,Expression.Convert(tryparseVarExpDecimal,typeof(object)),Expression.Constant(type, typeof(Type)))),
                                         Expression.Return(returnTarget, Expression.Convert(Expression.Default(typeOrg), typeof(object)))
                                     )
                                 )
@@ -2650,7 +2650,7 @@ Expression LocalFuncGetExpression(bool ignoreArray = false)
                                     Expression.Return(returnTarget, Expression.Convert(tryparseVarExp, typeof(object))),
                                     Expression.IfThenElse(
                                         Expression.IsTrue(Expression.Call(MethodDecimalTryParse, Expression.Convert(valueExp, typeof(string)), Expression.Constant(System.Globalization.NumberStyles.Any), Expression.Constant(null, typeof(IFormatProvider)), tryparseVarExpDecimal)),
-                                        Expression.Return(returnTarget, Expression.Convert(Expression.Convert(tryparseVarExpDecimal, tryparseVarExp.Type), typeof(object))),
+                                        Expression.Return(returnTarget, Expression.Call(MethodConvertChangeType,Expression.Convert(tryparseVarExpDecimal,typeof(object)),Expression.Constant(type, typeof(Type)))),
                                         Expression.Return(returnTarget, Expression.Convert(Expression.Default(typeOrg), typeof(object)))
                                     )
                                 )

Original file line number	Diff line number	Diff line change
`@@ -2558,7 +2558,7 @@ Expression LocalFuncGetExpression(bool ignoreArray = false)`
`2558`	`2558`	`Expression.Return(returnTarget, Expression.Convert(tryparseVarExp, typeof(object))),`
`2559`	`2559`	`Expression.IfThenElse(`
`2560`	`2560`	`Expression.IsTrue(Expression.Call(MethodDecimalTryParse, Expression.Convert(valueExp, typeof(string)), Expression.Constant(System.Globalization.NumberStyles.Any), Expression.Constant(null, typeof(IFormatProvider)), tryparseVarExpDecimal)),`
`2561`		`- Expression.Return(returnTarget, Expression.Convert(Expression.Convert(tryparseVarExpDecimal, tryparseVarExp.Type), typeof(object))),`
	`2561`	`+ Expression.Return(returnTarget, Expression.Call(MethodConvertChangeType,Expression.Convert(tryparseVarExpDecimal,typeof(object)),Expression.Constant(type, typeof(Type)))),`
`2562`	`2562`	`Expression.Return(returnTarget, Expression.Convert(Expression.Default(typeOrg), typeof(object)))`
`2563`	`2563`	`)`
`2564`	`2564`	`)`
`@@ -2574,7 +2574,7 @@ Expression LocalFuncGetExpression(bool ignoreArray = false)`
`2574`	`2574`	`Expression.Return(returnTarget, Expression.Convert(tryparseVarExp, typeof(object))),`
`2575`	`2575`	`Expression.IfThenElse(`
`2576`	`2576`	`Expression.IsTrue(Expression.Call(MethodDecimalTryParse, Expression.Convert(valueExp, typeof(string)), Expression.Constant(System.Globalization.NumberStyles.Any), Expression.Constant(null, typeof(IFormatProvider)), tryparseVarExpDecimal)),`
`2577`		`- Expression.Return(returnTarget, Expression.Convert(Expression.Convert(tryparseVarExpDecimal, tryparseVarExp.Type), typeof(object))),`
	`2577`	`+ Expression.Return(returnTarget, Expression.Call(MethodConvertChangeType,Expression.Convert(tryparseVarExpDecimal,typeof(object)),Expression.Constant(type, typeof(Type)))),`
`2578`	`2578`	`Expression.Return(returnTarget, Expression.Convert(Expression.Default(typeOrg), typeof(object)))`
`2579`	`2579`	`)`
`2580`	`2580`	`)`
`@@ -2590,7 +2590,7 @@ Expression LocalFuncGetExpression(bool ignoreArray = false)`
`2590`	`2590`	`Expression.Return(returnTarget, Expression.Convert(tryparseVarExp, typeof(object))),`
`2591`	`2591`	`Expression.IfThenElse(`
`2592`	`2592`	`Expression.IsTrue(Expression.Call(MethodDecimalTryParse, Expression.Convert(valueExp, typeof(string)), Expression.Constant(System.Globalization.NumberStyles.Any), Expression.Constant(null, typeof(IFormatProvider)), tryparseVarExpDecimal)),`
`2593`		`- Expression.Return(returnTarget, Expression.Convert(Expression.Convert(tryparseVarExpDecimal, tryparseVarExp.Type), typeof(object))),`
	`2593`	`+ Expression.Return(returnTarget, Expression.Call(MethodConvertChangeType,Expression.Convert(tryparseVarExpDecimal,typeof(object)),Expression.Constant(type, typeof(Type)))),`
`2594`	`2594`	`Expression.Return(returnTarget, Expression.Convert(Expression.Default(typeOrg), typeof(object)))`
`2595`	`2595`	`)`
`2596`	`2596`	`)`
`@@ -2618,7 +2618,7 @@ Expression LocalFuncGetExpression(bool ignoreArray = false)`
`2618`	`2618`	`Expression.Return(returnTarget, Expression.Convert(tryparseVarExp, typeof(object))),`
`2619`	`2619`	`Expression.IfThenElse(`
`2620`	`2620`	`Expression.IsTrue(Expression.Call(MethodDecimalTryParse, Expression.Convert(valueExp, typeof(string)), Expression.Constant(System.Globalization.NumberStyles.Any), Expression.Constant(null, typeof(IFormatProvider)), tryparseVarExpDecimal)),`
`2621`		`- Expression.Return(returnTarget, Expression.Convert(Expression.Convert(tryparseVarExpDecimal, tryparseVarExp.Type), typeof(object))),`
	`2621`	`+ Expression.Return(returnTarget, Expression.Call(MethodConvertChangeType,Expression.Convert(tryparseVarExpDecimal,typeof(object)),Expression.Constant(type, typeof(Type)))),`
`2622`	`2622`	`Expression.Return(returnTarget, Expression.Convert(Expression.Default(typeOrg), typeof(object)))`
`2623`	`2623`	`)`
`2624`	`2624`	`)`
`@@ -2634,7 +2634,7 @@ Expression LocalFuncGetExpression(bool ignoreArray = false)`
`2634`	`2634`	`Expression.Return(returnTarget, Expression.Convert(tryparseVarExp, typeof(object))),`
`2635`	`2635`	`Expression.IfThenElse(`
`2636`	`2636`	`Expression.IsTrue(Expression.Call(MethodDecimalTryParse, Expression.Convert(valueExp, typeof(string)), Expression.Constant(System.Globalization.NumberStyles.Any), Expression.Constant(null, typeof(IFormatProvider)), tryparseVarExpDecimal)),`
`2637`		`- Expression.Return(returnTarget, Expression.Convert(Expression.Convert(tryparseVarExpDecimal, tryparseVarExp.Type), typeof(object))),`
	`2637`	`+ Expression.Return(returnTarget, Expression.Call(MethodConvertChangeType,Expression.Convert(tryparseVarExpDecimal,typeof(object)),Expression.Constant(type, typeof(Type)))),`
`2638`	`2638`	`Expression.Return(returnTarget, Expression.Convert(Expression.Default(typeOrg), typeof(object)))`
`2639`	`2639`	`)`
`2640`	`2640`	`)`
`@@ -2650,7 +2650,7 @@ Expression LocalFuncGetExpression(bool ignoreArray = false)`
`2650`	`2650`	`Expression.Return(returnTarget, Expression.Convert(tryparseVarExp, typeof(object))),`
`2651`	`2651`	`Expression.IfThenElse(`
`2652`	`2652`	`Expression.IsTrue(Expression.Call(MethodDecimalTryParse, Expression.Convert(valueExp, typeof(string)), Expression.Constant(System.Globalization.NumberStyles.Any), Expression.Constant(null, typeof(IFormatProvider)), tryparseVarExpDecimal)),`
`2653`		`- Expression.Return(returnTarget, Expression.Convert(Expression.Convert(tryparseVarExpDecimal, tryparseVarExp.Type), typeof(object))),`
	`2653`	`+ Expression.Return(returnTarget, Expression.Call(MethodConvertChangeType,Expression.Convert(tryparseVarExpDecimal,typeof(object)),Expression.Constant(type, typeof(Type)))),`
`2654`	`2654`	`Expression.Return(returnTarget, Expression.Convert(Expression.Default(typeOrg), typeof(object)))`
`2655`	`2655`	`)`
`2656`	`2656`	`)`