Skip to content

Query: Remove convert node around object.Equals with value types #20775

New issue

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

#

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

Already on GitHub? # to your account

Merged
merged 1 commit into from
Apr 29, 2020
Merged

Query: Remove convert node around object.Equals with value types #20775

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
13 changes: 10 additions & 3 deletions src/EFCore.Cosmos/Query/Internal/CosmosSqlTranslatingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
&& methodCallExpression.Arguments.Count == 1)
{
var left = Visit(methodCallExpression.Object);
var right = Visit(methodCallExpression.Arguments[0]);
var right = Visit(RemoveObjectConvert(methodCallExpression.Arguments[0]));

if (TryRewriteEntityEquality(ExpressionType.Equal,
left ?? methodCallExpression.Object,
Expand All @@ -332,8 +332,8 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
&& methodCallExpression.Object == null
&& methodCallExpression.Arguments.Count == 2)
{
var left = Visit(methodCallExpression.Arguments[0]);
var right = Visit(methodCallExpression.Arguments[1]);
var left = Visit(RemoveObjectConvert(methodCallExpression.Arguments[0]));
var right = Visit(RemoveObjectConvert(methodCallExpression.Arguments[1]));

if (TryRewriteEntityEquality(ExpressionType.Equal,
left ?? methodCallExpression.Arguments[0],
Expand Down Expand Up @@ -417,6 +417,13 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
}

return _methodCallTranslatorProvider.Translate(_model, sqlObject, methodCallExpression.Method, arguments);

static Expression RemoveObjectConvert(Expression expression)
=> expression is UnaryExpression unaryExpression
&& (unaryExpression.NodeType == ExpressionType.Convert || unaryExpression.NodeType == ExpressionType.ConvertChecked)
&& unaryExpression.Type == typeof(object)
? unaryExpression.Operand
: expression;
}

/// <summary>
Expand Down
18 changes: 3 additions & 15 deletions src/EFCore.Cosmos/Query/Internal/EqualsTranslator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ public virtual SqlExpression Translate(SqlExpression instance, MethodInfo method
&& arguments.Count == 1)
{
left = instance;
right = RemoveObjectConvert(arguments[0]);
right = arguments[0];
}
else if (instance == null
&& method.Name == nameof(object.Equals)
&& arguments.Count == 2)
{
left = RemoveObjectConvert(arguments[0]);
right = RemoveObjectConvert(arguments[1]);
left = arguments[0];
right = arguments[1];
}

if (left != null
Expand All @@ -70,17 +70,5 @@ public virtual SqlExpression Translate(SqlExpression instance, MethodInfo method

return null;
}

private SqlExpression RemoveObjectConvert(SqlExpression expression)
{
if (expression is SqlUnaryExpression sqlUnaryExpression
&& sqlUnaryExpression.OperatorType == ExpressionType.Convert
&& sqlUnaryExpression.Type == typeof(object))
{
return sqlUnaryExpression.Operand;
}

return expression;
}
}
}
18 changes: 3 additions & 15 deletions src/EFCore.Relational/Query/Internal/EqualsTranslator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ public virtual SqlExpression Translate(SqlExpression instance, MethodInfo method
&& arguments.Count == 1)
{
left = instance;
right = RemoveObjectConvert(arguments[0]);
right = arguments[0];
}
else if (instance == null
&& method.Name == nameof(object.Equals)
&& arguments.Count == 2)
{
left = RemoveObjectConvert(arguments[0]);
right = RemoveObjectConvert(arguments[1]);
left = arguments[0];
right = arguments[1];
}

if (left != null
Expand All @@ -56,17 +56,5 @@ public virtual SqlExpression Translate(SqlExpression instance, MethodInfo method

return null;
}

private SqlExpression RemoveObjectConvert(SqlExpression expression)
{
if (expression is SqlUnaryExpression sqlUnaryExpression
&& sqlUnaryExpression.OperatorType == ExpressionType.Convert
&& sqlUnaryExpression.Type == typeof(object))
{
return sqlUnaryExpression.Operand;
}

return expression;
}
}
}
13 changes: 10 additions & 3 deletions src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ static bool IsAggregateResultWithCustomShaper(MethodInfo method)
&& methodCallExpression.Arguments.Count == 1)
{
var left = Visit(methodCallExpression.Object);
var right = Visit(methodCallExpression.Arguments[0]);
var right = Visit(RemoveObjectConvert(methodCallExpression.Arguments[0]));

if (TryRewriteEntityEquality(ExpressionType.Equal,
left ?? methodCallExpression.Object,
Expand All @@ -471,8 +471,8 @@ static bool IsAggregateResultWithCustomShaper(MethodInfo method)
&& methodCallExpression.Object == null
&& methodCallExpression.Arguments.Count == 2)
{
var left = Visit(methodCallExpression.Arguments[0]);
var right = Visit(methodCallExpression.Arguments[1]);
var left = Visit(RemoveObjectConvert(methodCallExpression.Arguments[0]));
var right = Visit(RemoveObjectConvert(methodCallExpression.Arguments[1]));

if (TryRewriteEntityEquality(ExpressionType.Equal,
left ?? methodCallExpression.Arguments[0],
Expand Down Expand Up @@ -556,6 +556,13 @@ static bool IsAggregateResultWithCustomShaper(MethodInfo method)
}

return Dependencies.MethodCallTranslatorProvider.Translate(_model, sqlObject, methodCallExpression.Method, arguments);

static Expression RemoveObjectConvert(Expression expression)
=> expression is UnaryExpression unaryExpression
&& (unaryExpression.NodeType == ExpressionType.Convert || unaryExpression.NodeType == ExpressionType.ConvertChecked)
&& unaryExpression.Type == typeof(object)
? unaryExpression.Operand
: expression;
}

protected override Expression VisitNew(NewExpression newExpression)
Expand Down
23 changes: 23 additions & 0 deletions test/EFCore.Specification.Tests/ConvertToProviderTypesTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

using System.Linq;
using Xunit;

namespace Microsoft.EntityFrameworkCore
{
public abstract class ConvertToProviderTypesTestBase<TFixture> : BuiltInDataTypesTestBase<TFixture>
Expand All @@ -11,6 +14,26 @@ protected ConvertToProviderTypesTestBase(TFixture fixture)
{
}

[ConditionalFact]
public virtual void Equals_method_over_enum_works()
{
using var context = CreateContext();

var query = context.Set<BuiltInDataTypes>().Where(t => t.Id == -1 && t.Enum8.Equals(Enum8.SomeValue)).ToList();

Assert.Empty(query);
}

[ConditionalFact]
public virtual void Object_equals_method_over_enum_works()
{
using var context = CreateContext();

var query = context.Set<BuiltInDataTypes>().Where(t => t.Id == -1 && Equals(t.Enum8, Enum8.SomeValue)).ToList();

Assert.Empty(query);
}

public override void Object_to_string_conversion() {}

public abstract class ConvertToProviderTypesFixtureBase : BuiltInDataTypesFixtureBase
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.SqlServer.FunctionalTests/Query/NorthwindFunctionsQuerySqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1395,7 +1395,7 @@ public override async Task Static_equals_nullable_datetime_compared_to_non_nulla
await base.Static_equals_nullable_datetime_compared_to_non_nullable(async);

AssertSql(
@"@__arg_0='1996-07-04T00:00:00.0000000'
@"@__arg_0='1996-07-04T00:00:00.0000000' (DbType = DateTime)

SELECT [o].[OrderID], [o].[CustomerID], [o].[EmployeeID], [o].[OrderDate]
FROM [Orders] AS [o]
Expand Down