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.

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

Correct parentheses logic for SQLite JsonScalarExpression #30908

Merged
merged 1 commit into from
May 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/EFCore.Relational/Query/QuerySqlGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1533,7 +1533,7 @@ protected virtual bool RequiresParentheses(SqlExpression outerExpression, SqlExp
return true;
}

case CollateExpression or LikeExpression or AtTimeZoneExpression:
case CollateExpression or LikeExpression or AtTimeZoneExpression or JsonScalarExpression:
return !TryGetOperatorInfo(outerExpression, out outerPrecedence, out _)
|| !TryGetOperatorInfo(innerExpression, out innerPrecedence, out _)
|| outerPrecedence >= innerPrecedence;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,9 @@ protected override bool TryGetOperatorInfo(SqlExpression expression, out int pre
LikeExpression => (350, false),
AtTimeZoneExpression => (1200, false),

// On SQL Server, JsonScalarExpression renders as a function (JSON_VALUE()), so there's never a need for parentheses.
JsonScalarExpression => (9999, false),

_ => default,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ from e4 in context.Set<OperatorEntityLong>()
from e5 in context.Set<OperatorEntityLong>()
orderby e3.Id, e4.Id, e5.Id
select ((~(-(-((e5.Value + e3.Value) + 2))) % (-(e4.Value + e4.Value) - e3.Value)))).ToList();

Assert.Equal(expected.Count, actual.Count);
for (var i = 0; i < expected.Count; i++)
{
Expand Down Expand Up @@ -267,4 +267,38 @@ public virtual async Task Negate_on_like_expression(bool async)
Assert.Equal(expected[i], actual[i]);
}
}

#nullable enable
[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Concat_and_json_scalar(bool async)
{
var contextFactory = await InitializeAsync<DbContext>(
onModelCreating: mb => mb
.Entity<Owner>()
.OwnsOne(o => o.Owned)
.ToJson(),
seed: context =>
{
context.Set<Owner>().AddRange(
new Owner { Owned = new() { SomeProperty = "Bar" } },
new Owner { Owned = new() { SomeProperty = "Baz" } });
context.SaveChanges();
});
await using var context = contextFactory.CreateContext();

var result = await context.Set<Owner>().SingleAsync(o => "Foo" + o.Owned.SomeProperty == "FooBar");
Assert.Equal("Bar", result.Owned.SomeProperty);
}

class Owner
{
public int Id { get; set; }
public Owned Owned { get; set; } = null!;
}

class Owned
{
public string SomeProperty { get; set; } = "";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,10 @@ public virtual async Task Column_with_custom_converter()
public virtual async Task Parameter_with_inferred_value_converter()
{
var contextFactory = await InitializeAsync<TestContext>(
onModelCreating: mb => mb.Entity<TestEntity>(
b =>
{
b.Property<IntWrapper>("PropertyWithValueConverter")
.HasConversion(w => w.Value, i => new IntWrapper(i));
}),
onModelCreating: mb => mb
.Entity<TestEntity>()
.Property<IntWrapper>("PropertyWithValueConverter")
.HasConversion(w => w.Value, i => new IntWrapper(i)),
seed: context =>
{
var entry1 = context.Add(new TestEntity { Id = 1 });
Expand All @@ -158,12 +156,10 @@ public virtual async Task Parameter_with_inferred_value_converter()
public virtual async Task Constant_with_inferred_value_converter()
{
var contextFactory = await InitializeAsync<TestContext>(
onModelCreating: mb => mb.Entity<TestEntity>(
b =>
{
b.Property<IntWrapper>("PropertyWithValueConverter")
.HasConversion(w => w.Value, i => new IntWrapper(i));
}),
onModelCreating: mb => mb
.Entity<TestEntity>()
.Property<IntWrapper>("PropertyWithValueConverter")
.HasConversion(w => w.Value, i => new IntWrapper(i)),
seed: context =>
{
var entry1 = context.Add(new TestEntity { Id = 1 });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,18 @@ WHERE [o].[Value] IS NOT NULL AND NOT ([o].[Value] LIKE N'A%')
""");
}

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

AssertSql(
"""
SELECT TOP(2) [o].[Id], [o].[Owned]
FROM [Owner] AS [o]
WHERE N'Foo' + JSON_VALUE([o].[Owned], '$.SomeProperty') = N'FooBar'
""");
}

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual async Task Where_AtTimeZone_datetimeoffset_constant(bool async)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,19 @@ public override async Task Negate_on_like_expression(bool async)
SELECT "o"."Id"
FROM "OperatorEntityString" AS "o"
WHERE "o"."Value" IS NOT NULL AND NOT ("o"."Value" LIKE 'A%')
""");
}

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

AssertSql(
"""
SELECT "o"."Id", "o"."Owned"
FROM "Owner" AS "o"
WHERE 'Foo' || ("o"."Owned" ->> 'SomeProperty') = 'FooBar'
LIMIT 2
""");
}
}