Skip to content

Fix DynamicExpressionParser and ExpressionPromoter to support LambdExpression #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StefH merged 4 commits into from
Dec 4, 2022
Merged

Fix DynamicExpressionParser and ExpressionPromoter to support LambdExpression #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67f1692
Fix DynamicExpressionParser and ExpressionPromoter to support LambdaE…
StefH Nov 20, 2022
c7f9d80
Merge branch 'master' into stef-isue-648
StefH Nov 27, 2022
14bad5c
Merge branch 'master' into stef-isue-648
StefH Nov 30, 2022
9661815
ut
StefH Dec 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/System.Linq.Dynamic.Core/DynamicExpressionParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,24 +120,24 @@ public static LambdaExpression ParseLambda(Type? delegateType, ParsingConfig? pa

var parsedExpression = parser.Parse(resultType, createParameterCtor);

LambdaExpression lambdaExpression;
if (parsedExpression is LambdaExpression lambdaExpression)
{
return lambdaExpression;
}

if (parsingConfig is { RenameParameterExpression: true } && parameters.Length == 1)
{
var renamer = new ParameterExpressionRenamer(parser.LastLambdaItName);
parsedExpression = renamer.Rename(parsedExpression, out ParameterExpression newParameterExpression);
parsedExpression = renamer.Rename(parsedExpression, out var newParameterExpression);

lambdaExpression = delegateType == null ?
return delegateType == null ?
Expression.Lambda(parsedExpression, newParameterExpression) :
Expression.Lambda(delegateType, parsedExpression, newParameterExpression);
}
else
{
lambdaExpression = delegateType == null ?
Expression.Lambda(parsedExpression, parameters) :
Expression.Lambda(delegateType, parsedExpression, parameters);
}

return lambdaExpression;
return delegateType == null ?
Expression.Lambda(parsedExpression, parameters) :
Expression.Lambda(delegateType, parsedExpression, parameters);
}

/// <summary>
Expand Down
14 changes: 12 additions & 2 deletions src/System.Linq.Dynamic.Core/Parser/ExpressionPromoter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,17 @@ public ExpressionPromoter(ParsingConfig config)
/// <inheritdoc />
public virtual Expression? Promote(Expression expr, Type type, bool exact, bool convertExpr)
{
if (expr.Type == type || type.IsGenericParameter)
Type returnType;
if (expr is LambdaExpression lambdaExpression)
{
returnType = lambdaExpression.GetReturnType();
}
else
{
returnType = expr.Type;
}

if (returnType == type || type.IsGenericParameter)
{
return expr;
}
Expand Down Expand Up @@ -103,7 +113,7 @@ public ExpressionPromoter(ParsingConfig config)
}
}

if (TypeHelper.IsCompatibleWith(expr.Type, type))
if (TypeHelper.IsCompatibleWith(returnType, type))
{
if (type == typeof(decimal) && TypeHelper.IsEnumType(expr.Type))
{
Expand Down
32 changes: 20 additions & 12 deletions test/System.Linq.Dynamic.Core.Tests/DynamicExpressionParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ public void DynamicExpressionParser_ParseLambda_Select_2()

// https://github.com/StefH/System.Linq.Dynamic.Core/issues/58
[Fact]
public void DynamicExpressionParser_ParseLambda_4_Issue58()
public void DynamicExpressionParser_ParseLambda_Issue58()
{
var expressionParams = new[]
{
Expand Down Expand Up @@ -1251,14 +1251,16 @@ public void DynamicExpressionParser_ParseLambda_Operator_Less_Greater_With_Guids
}

[Theory]
[InlineData("c => c.Age == 8", "c => (c.Age == 8)")]
[InlineData("c => c.Name == \"test\"", "c => (c.Name == \"test\")")]
public void DynamicExpressionParser_ParseLambda_RenameParameterExpression(string expressionAsString, string expected)
[InlineData(true, "c => c.Age == 8", "c => (c.Age == 8)")]
[InlineData(true, "c => c.Name == \"test\"", "c => (c.Name == \"test\")")]
[InlineData(false, "c => c.Age == 8", "Param_0 => (Param_0.Age == 8)")]
[InlineData(false, "c => c.Name == \"test\"", "Param_0 => (Param_0.Name == \"test\")")]
public void DynamicExpressionParser_ParseLambda_RenameParameterExpression(bool renameParameterExpression, string expressionAsString, string expected)
{
// Arrange
var config = new ParsingConfig
{
RenameParameterExpression = true
RenameParameterExpression = renameParameterExpression
};

// Act
Expand Down Expand Up @@ -1500,22 +1502,28 @@ public void DynamicExpressionParser_ParseLambda_Func()
}

[Theory]
[InlineData(1, true)]
[InlineData(5, false)]
public void DynamicExpressionParser_ParseLambda_Func2(int? input, bool expected)
[InlineData("value", "value != null && value == 1", 1, true)]
[InlineData("value", "value != null && value == 1", 5, false)]
[InlineData("x", "value != null && value == 1", 1, true)]
[InlineData("x", "value != null && value == 1", 5, false)]
[InlineData(null, "value != null && value == 1", 1, true)]
[InlineData(null, "value != null && value == 1", 5, false)]
[InlineData("value", "value => value != null && value == 1", 1, true)]
[InlineData("value", "value => value != null && value == 1", 5, false)]
public void DynamicExpressionParser_ParseLambda_Func2(string? paramName, string test, int? input, bool expected)
{
// Arrange
var nullableType = typeof(int?);
var functionType = typeof(Func<,>).MakeGenericType(nullableType, typeof(bool));
var valueParameter = Expression.Parameter(nullableType, "value");
var delegateType = typeof(Func<,>).MakeGenericType(nullableType, typeof(bool));
var valueParameter = paramName is not null ? Expression.Parameter(nullableType, paramName) : Expression.Parameter(nullableType);

// Act 1
var expression = DynamicExpressionParser.ParseLambda(
functionType,
delegateType,
new ParsingConfig(),
new[] { valueParameter },
typeof(bool),
"value != null && value == 1"
test
);

// Act 2
Expand Down