Skip to content

op_Compare also for single "equals" token #276

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 2 commits into from
Jun 14, 2019
Merged

op_Compare also for single "equals" token #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a953ce6
Added tests for just single '=' in equality
nothrow Jun 14, 2019
845e043
Single '=' is also op_Equality
nothrow Jun 14, 2019
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
1 change: 1 addition & 0 deletions src/System.Linq.Dynamic.Core/Parser/ExpressionParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1902,6 +1902,7 @@ static string GetOverloadedOperationName(TokenId tokenId)
switch (tokenId)
{
case TokenId.DoubleEqual:
case TokenId.Equal:
return "op_Equality";
case TokenId.ExclamationEqual:
return "op_Inequality";
Expand Down
8 changes: 5 additions & 3 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 @@ -143,8 +143,10 @@ public void DynamicExpressionParser_ParseLambda_UseParameterizedNamesInDynamicQu
Check.That(value).IsEqualTo("x");
}

[Fact]
public void DynamicExpressionParser_ParseLambda_WithStructWithEquality()
[Theory]
[InlineData("Where(x => x.SnowflakeId == {0})")]
[InlineData("Where(x => x.SnowflakeId = {0})")]
public void DynamicExpressionParser_ParseLambda_WithStructWithEquality(string query)
{
// Assign
var testList = User.GenerateSampleModels(51);
Expand All @@ -153,7 +155,7 @@ public void DynamicExpressionParser_ParseLambda_WithStructWithEquality()
// Act
ulong expectedX = (ulong) long.MaxValue + 3;

string query = $"Where(x => x.SnowflakeId == {expectedX})";
query = string.Format(query, expectedX);
LambdaExpression expression = DynamicExpressionParser.ParseLambda(qry.GetType(), null, query);
Delegate del = expression.Compile();
IEnumerable<dynamic> result = del.DynamicInvoke(qry) as IEnumerable<dynamic>;
Expand Down
8 changes: 7 additions & 1 deletion test/System.Linq.Dynamic.Core.Tests/ExpressionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1704,14 +1704,18 @@ public void ExpressionTests_Type_StructWithIntegerEquality()

// Act
var resultL = valuesL.Where("it == 100");
var resultLs = valuesL.Where("it = 100");
var resultNL = valuesL.Where("it != 1 && it != 5");
var resultArg = valuesL.Where("it == @0", 100);
var resultArgs = valuesL.Where("it = @0", 100);
var resultIn = valuesL.Where("it in (100)");

// Assert
Assert.Equal(resultValuesL.ToArray(), resultL);
Assert.Equal(resultValuesL.ToArray(), resultLs);
Assert.Equal(resultValuesL.ToArray(), resultNL);
Assert.Equal(resultValuesL.ToArray(), resultArg);
Assert.Equal(resultValuesL.ToArray(), resultArgs);
Assert.Equal(resultValuesL.ToArray(), resultIn);
}

Expand Down Expand Up @@ -1743,13 +1747,15 @@ public void ExpressionTests_Type_StructWithIntegerEquality_BothVariablesInStruct
Id = new SnowflakeId(1L),
Var = 1
}
}.AsQueryable();
}.AsQueryable().ToArray();

// Act
var resultL = valuesL.Where("it.Id == it.Var");
var resultLs = valuesL.Where("it.Id = it.Var");

// Assert
Assert.Equal(resultValuesL.ToArray(), resultL);
Assert.Equal(resultValuesL.ToArray(), resultLs);
}

[Fact]
Expand Down