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

- 优化 表达式树三元表达式解析，当 Test 为变量时不解析成 case when end；

Browse Source
This commit is contained in:
2881099
2020-11-13 10:21:09 +08:00
parent d3f95e1177
commit 14ba84c24b
2 changed files with 121 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
FreeSql/Internal/CommonExpression.cs
View File

@ -70,6 +70,11 @@ namespace FreeSql.Internal
else if (index == ReadAnonymousFieldAsCsName && string.IsNullOrEmpty(parent.CsName) == false) field.Append(_common.FieldAsAlias(parent.CsName));
if (parent.CsType == null && exp.Type.IsValueType) parent.CsType = exp.Type;
return false;
case ExpressionType.Conditional:
var condExp = exp as ConditionalExpression;
if (condExp.Test.IsParameter() == false) return ReadAnonymousField(_tables, field, parent, ref index,
(bool)Expression.Lambda(condExp.Test).Compile().DynamicInvoke() ? condExp.IfTrue : condExp.IfFalse, select, diymemexp, whereGlobalFilter, findIncludeMany, isAllDtoMap);
break;
case ExpressionType.Call:
var callExp = exp as MethodCallExpression;
//处理自定义SQL语句，如： ToList(new {
@ -703,11 +708,28 @@ namespace FreeSql.Internal
case ExpressionType.Conditional:
var condExp = exp as ConditionalExpression;
var conditionalTestOldMapType = tsc.SetMapTypeReturnOld(null);
var conditionalTestSql = ExpressionLambdaToSql(condExp.Test, tsc);
tsc.SetMapTypeReturnOld(conditionalTestOldMapType);
var conditionalSql = _common.IIF(conditionalTestSql, ExpressionLambdaToSql(condExp.IfTrue, tsc), ExpressionLambdaToSql(condExp.IfFalse, tsc));
tsc.SetMapTypeReturnOld(null);
return conditionalSql;
if (condExp.Test.IsParameter())
{
var conditionalTestSql = ExpressionLambdaToSql(condExp.Test, tsc);
tsc.SetMapTypeReturnOld(conditionalTestOldMapType);
var conditionalSql = _common.IIF(conditionalTestSql, ExpressionLambdaToSql(condExp.IfTrue, tsc), ExpressionLambdaToSql(condExp.IfFalse, tsc));
tsc.SetMapTypeReturnOld(null);
return conditionalSql;
}
if ((bool)Expression.Lambda(condExp.Test).Compile().DynamicInvoke())
{
tsc.SetMapTypeReturnOld(conditionalTestOldMapType);
var conditionalSql = ExpressionLambdaToSql(condExp.IfTrue, tsc);
tsc.SetMapTypeReturnOld(null);
return conditionalSql;
}
else
{
tsc.SetMapTypeReturnOld(conditionalTestOldMapType);
var conditionalSql = ExpressionLambdaToSql(condExp.IfFalse, tsc);
tsc.SetMapTypeReturnOld(null);
return conditionalSql;
}
case ExpressionType.Call:
tsc.mapType = null;
var exp3 = exp as MethodCallExpression;