Skip to content

Fixes #1490: Remove useless Expression.Condition when parsing IsOf #1491

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
merged 1 commit into from
Aug 6, 2025
Merged

Fixes #1490: Remove useless Expression.Condition when parsing IsOf #1491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/Microsoft.AspNetCore.OData/Query/Expressions/ExpressionBinderBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,8 @@ private Expression BindIsOf(SingleValueFunctionCallNode node)
}
}

// Be caution: Type method of LINQ to Entities only supports entity type.
return Expression.Condition(Expression.TypeIs(source, clrType), TrueConstant, FalseConstant);
// Be caution: Type method of LINQ to Entities only supports entity types.
return Expression.TypeIs(source, clrType);
}

private Expression BindCeiling(SingleValueFunctionCallNode node)
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.AspNetCore.OData/Query/Expressions/QueryBinder.SingleValueFunctionCall.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,8 +680,8 @@ protected virtual Expression BindIsOf(SingleValueFunctionCallNode node, QueryBin
}
}

// Be caution: Type method of LINQ to Entities only supports entity type.
return Expression.Condition(Expression.TypeIs(source, clrType), TrueConstant, FalseConstant);
// Be caution: Type method of LINQ to Entities only supports entity types.
return Expression.TypeIs(source, clrType);
}

/// <summary>
Expand Down
12 changes: 6 additions & 6 deletions test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/FilterBinderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2493,12 +2493,12 @@ public void CastToQuotedEntityOrComplexType_DerivedProductName(string filter, st
#region 'isof' in query option

[Theory]
[InlineData("isof(Edm.Int16)", "$it => IIF(($it Is System.Int16), True, False)")]
[InlineData("isof('Microsoft.AspNetCore.OData.Tests.Models.Product')", "$it => IIF(($it Is Microsoft.AspNetCore.OData.Tests.Models.Product), True, False)")]
[InlineData("isof(ProductName,Edm.String)", "$it => IIF(($it.ProductName Is System.String), True, False)")]
[InlineData("isof(Category,'Microsoft.AspNetCore.OData.Tests.Models.Category')", "$it => IIF(($it.Category Is Microsoft.AspNetCore.OData.Tests.Models.Category), True, False)")]
[InlineData("isof(Category,'Microsoft.AspNetCore.OData.Tests.Models.DerivedCategory')", "$it => IIF(($it.Category Is Microsoft.AspNetCore.OData.Tests.Models.DerivedCategory), True, False)")]
[InlineData("isof(Ranking, 'Microsoft.AspNetCore.OData.Tests.Models.SimpleEnum')", "$it => IIF(($it.Ranking Is Microsoft.AspNetCore.OData.Tests.Models.SimpleEnum), True, False)")]
[InlineData("isof(Edm.Int16)", "$it => ($it Is System.Int16)")]
[InlineData("isof('Microsoft.AspNetCore.OData.Tests.Models.Product')", "$it => ($it Is Microsoft.AspNetCore.OData.Tests.Models.Product)")]
[InlineData("isof(ProductName,Edm.String)", "$it => ($it.ProductName Is System.String)")]
[InlineData("isof(Category,'Microsoft.AspNetCore.OData.Tests.Models.Category')", "$it => ($it.Category Is Microsoft.AspNetCore.OData.Tests.Models.Category)")]
[InlineData("isof(Category,'Microsoft.AspNetCore.OData.Tests.Models.DerivedCategory')", "$it => ($it.Category Is Microsoft.AspNetCore.OData.Tests.Models.DerivedCategory)")]
[InlineData("isof(Ranking, 'Microsoft.AspNetCore.OData.Tests.Models.SimpleEnum')", "$it => ($it.Ranking Is Microsoft.AspNetCore.OData.Tests.Models.SimpleEnum)")]
public void IsofMethod_Succeeds(string filter, string expectedResult)
{
// Arrange & Act & Assert
Expand Down