Skip to content
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

Jump to bottom

Fix Issue 13919: Translation error using negative #21389

Merged
merged 5 commits into from
Jun 30, 2020
Merged

Fix Issue 13919: Translation error using negative #21389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
62d3bd7
create negation unit tests
jonlouie Jun 23, 2020
bb0fd05
add parentheses to negated expression on translation
jonlouie Jun 23, 2020
bcceed1
expose unit test to sqlite test suite
jonlouie Jun 23, 2020
5aa0374
add unit tests for negating a column and LIKE expression
jonlouie Jun 24, 2020
449f413
use RequiresBrackets helper
jonlouie Jun 24, 2020
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
10 changes: 10 additions & 0 deletions src/EFCore.Relational/Query/QuerySqlGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,17 @@ when sqlUnaryExpression.Type.UnwrapNullableType() == typeof(bool):
case ExpressionType.Negate:
{
_relationalCommandBuilder.Append("-");
var requiresBrackets = RequiresBrackets(sqlUnaryExpression.Operand);
if (requiresBrackets)
{
_relationalCommandBuilder.Append("(");
}

Visit(sqlUnaryExpression.Operand);
if (requiresBrackets)
{
_relationalCommandBuilder.Append(")");
}
break;
}
}
Expand Down
27 changes: 27 additions & 0 deletions test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,33 @@ protected GearsOfWarQueryTestBase(TFixture fixture)
{
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task Negate_on_binary_expression(bool async)
{
return AssertQuery(
async,
ss => ss.Set<Squad>().Where(s => s.Id == -(s.Id + s.Id)));
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task Negate_on_column(bool async)
{
return AssertQuery(
async,
ss => ss.Set<Squad>().Where(s => s.Id == -s.Id));
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task Negate_on_like_expression(bool async)
{
return AssertQuery(
async,
ss => ss.Set<Squad>().Where(s => !s.Name.StartsWith("us")));
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task Entity_equality_empty(bool async)
Expand Down
30 changes: 30 additions & 0 deletions test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,36 @@ public GearsOfWarQuerySqlServerTest(GearsOfWarQuerySqlServerFixture fixture, ITe

protected override bool CanExecuteQueryString => true;

public override async Task Negate_on_binary_expression(bool async)
{
await base.Negate_on_binary_expression(async);

AssertSql(
@"SELECT [s].[Id], [s].[Banner], [s].[Banner5], [s].[InternalNumber], [s].[Name]
FROM [Squads] AS [s]
WHERE [s].[Id] = -([s].[Id] + [s].[Id])");
}

public override async Task Negate_on_column(bool async)
{
await base.Negate_on_column(async);

AssertSql(
@"SELECT [s].[Id], [s].[Banner], [s].[Banner5], [s].[InternalNumber], [s].[Name]
FROM [Squads] AS [s]
WHERE [s].[Id] = -[s].[Id]");
}

public override async Task Negate_on_like_expression(bool async)
{
await base.Negate_on_like_expression(async);

AssertSql(
@"SELECT [s].[Id], [s].[Banner], [s].[Banner5], [s].[InternalNumber], [s].[Name]
FROM [Squads] AS [s]
WHERE [s].[Name] IS NOT NULL AND NOT ([s].[Name] LIKE N'us%')");
}

public override async Task Entity_equality_empty(bool async)
{
await base.Entity_equality_empty(async);
Expand Down
30 changes: 30 additions & 0 deletions test/EFCore.Sqlite.FunctionalTests/Query/GearsOfWarQuerySqliteTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,36 @@ public override Task DateTimeOffset_Date_returns_datetime(bool async)

public override Task Subquery_projecting_non_nullable_scalar_contains_non_nullable_value_doesnt_need_null_expansion_negated(bool async) => null;

public override async Task Negate_on_binary_expression(bool async)
{
await base.Negate_on_binary_expression(async);

AssertSql(
@"SELECT ""s"".""Id"", ""s"".""Banner"", ""s"".""Banner5"", ""s"".""InternalNumber"", ""s"".""Name""
FROM ""Squads"" AS ""s""
WHERE ""s"".""Id"" = -(""s"".""Id"" + ""s"".""Id"")");
}

public override async Task Negate_on_column(bool async)
{
await base.Negate_on_column(async);

AssertSql(
@"SELECT ""s"".""Id"", ""s"".""Banner"", ""s"".""Banner5"", ""s"".""InternalNumber"", ""s"".""Name""
FROM ""Squads"" AS ""s""
WHERE ""s"".""Id"" = -""s"".""Id""");
}

public override async Task Negate_on_like_expression(bool async)
{
await base.Negate_on_like_expression(async);

AssertSql(
@"SELECT ""s"".""Id"", ""s"".""Banner"", ""s"".""Banner5"", ""s"".""InternalNumber"", ""s"".""Name""
FROM ""Squads"" AS ""s""
WHERE ""s"".""Name"" IS NOT NULL AND NOT (""s"".""Name"" LIKE 'us%')");
}

public override async Task Select_datetimeoffset_comparison_in_projection(bool async)
{
await base.Select_datetimeoffset_comparison_in_projection(async);
Expand Down