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

[automated] Merge branch 'release/8.0' => 'main' #33944

Merged
merged 1 commit into from
Jun 11, 2024
Merged

[automated] Merge branch 'release/8.0' => 'main' #33944

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
7 changes: 6 additions & 1 deletion src/EFCore.SqlServer/Query/Internal/SqlServerQueryableMethodTranslatingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ public class SqlServerQueryableMethodTranslatingExpressionVisitor : RelationalQu
private static readonly bool UseOldBehavior32374 =
AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue32374", out var enabled32374) && enabled32374;

private static readonly bool UseOldBehavior33932 =
AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue33932", out var enabled33932) && enabled33932;

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
Expand Down Expand Up @@ -446,8 +449,9 @@ static IEnumerable<INavigation> GetAllNavigationsInHierarchy(IEntityType entityT
Offset: null,
Orderings: [],
Projection: [{ Expression: ColumnExpression { Name: "value", Table: var projectionColumnTable } }]
}
} subquery
}
&& (UseOldBehavior33932 || subquery.Predicate is null)
&& projectionColumnTable == openJsonExpression)
{
var newInExpression = _sqlExpressionFactory.In(translatedItem, parameter);
Expand Down Expand Up @@ -493,6 +497,7 @@ static IEnumerable<INavigation> GetAllNavigationsInHierarchy(IEntityType entityT
]
} selectExpression
&& TranslateExpression(index) is { } translatedIndex
&& (UseOldBehavior33932 || selectExpression.Predicate is null)
&& orderingTable == openJsonExpression)
{
// Index on JSON array
Expand Down
12 changes: 9 additions & 3 deletions src/EFCore.Sqlite.Core/Query/Internal/SqliteQueryableMethodTranslatingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ public class SqliteQueryableMethodTranslatingExpressionVisitor : RelationalQuery
private readonly SqliteSqlExpressionFactory _sqlExpressionFactory;
private readonly bool _areJsonFunctionsSupported;

private static readonly bool UseOldBehavior33932 =
AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue33932", out var enabled33932) && enabled33932;

/// <summary>
/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to
/// the same compatibility standards as public APIs. It may be changed or removed without notice in
Expand Down Expand Up @@ -82,7 +85,8 @@ protected override QueryableMethodTranslatingExpressionVisitor CreateSubqueryVis
IsDistinct: false,
Limit: null,
Offset: null
})
} subquery
&& (UseOldBehavior33932 || subquery.Predicate is null))
{
var translation =
_sqlExpressionFactory.GreaterThan(
Expand Down Expand Up @@ -180,7 +184,8 @@ protected override QueryableMethodTranslatingExpressionVisitor CreateSubqueryVis
IsDistinct: false,
Limit: null,
Offset: null
})
} subquery
&& (UseOldBehavior33932 || subquery.Predicate is null))
{
var translation = _sqlExpressionFactory.Function(
"json_array_length",
Expand Down Expand Up @@ -456,7 +461,8 @@ static IEnumerable<INavigation> GetAllNavigationsInHierarchy(IEntityType entityT
Offset: null
} selectExpression
&& orderingColumn.Table == jsonEachExpression
&& TranslateExpression(index) is { } translatedIndex)
&& TranslateExpression(index) is { } translatedIndex
&& (UseOldBehavior33932 || selectExpression.Predicate is null))
{
// Index on JSON array

Expand Down
14 changes: 14 additions & 0 deletions test/EFCore.Specification.Tests/Query/PrimitiveCollectionsQueryTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,20 @@ public virtual Task Column_collection_Length(bool async)
async,
ss => ss.Set<PrimitiveCollectionsEntity>().Where(c => c.Ints.Length == 2));

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task Column_collection_Count_with_predicate(bool async)
=> AssertQuery(
async,
ss => ss.Set<PrimitiveCollectionsEntity>().Where(c => c.Ints.Count(i => i > 1) == 2));

[ConditionalTheory] // #33932
[MemberData(nameof(IsAsyncData))]
public virtual Task Column_collection_Where_Count(bool async)
=> AssertQuery(
async,
ss => ss.Set<PrimitiveCollectionsEntity>().Where(c => c.Ints.Where(i => i > 1).Count() == 2));

[ConditionalTheory]
[MemberData(nameof(IsAsyncData))]
public virtual Task Column_collection_index_int(bool async)
Expand Down
6 changes: 6 additions & 0 deletions test/EFCore.SqlServer.FunctionalTests/Query/PrimitiveCollectionsQueryOldSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,12 @@ public override Task Column_collection_Count_method(bool async)
public override Task Column_collection_Length(bool async)
=> AssertCompatibilityLevelTooLow(() => base.Column_collection_Length(async));

public override Task Column_collection_Count_with_predicate(bool async)
=> AssertCompatibilityLevelTooLow(() => base.Column_collection_Count_with_predicate(async));

public override Task Column_collection_Where_Count(bool async)
=> AssertCompatibilityLevelTooLow(() => base.Column_collection_Where_Count(async));

public override Task Column_collection_index_int(bool async)
=> AssertCompatibilityLevelTooLow(() => base.Column_collection_index_int(async));

Expand Down
30 changes: 30 additions & 0 deletions test/EFCore.SqlServer.FunctionalTests/Query/PrimitiveCollectionsQuerySqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,36 @@ FROM OPENJSON([p].[Ints]) WITH ([value] int '$') AS [i]) = 2
""");
}

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

AssertSql(
"""
SELECT [p].[Id], [p].[Bool], [p].[Bools], [p].[DateTime], [p].[DateTimes], [p].[Enum], [p].[Enums], [p].[Int], [p].[Ints], [p].[NullableInt], [p].[NullableInts], [p].[NullableString], [p].[NullableStrings], [p].[String], [p].[Strings]
FROM [PrimitiveCollectionsEntity] AS [p]
WHERE (
SELECT COUNT(*)
FROM OPENJSON([p].[Ints]) WITH ([value] int '$') AS [i]
WHERE [i].[value] > 1) = 2
""");
}

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

AssertSql(
"""
SELECT [p].[Id], [p].[Bool], [p].[Bools], [p].[DateTime], [p].[DateTimes], [p].[Enum], [p].[Enums], [p].[Int], [p].[Ints], [p].[NullableInt], [p].[NullableInts], [p].[NullableString], [p].[NullableStrings], [p].[String], [p].[Strings]
FROM [PrimitiveCollectionsEntity] AS [p]
WHERE (
SELECT COUNT(*)
FROM OPENJSON([p].[Ints]) WITH ([value] int '$') AS [i]
WHERE [i].[value] > 1) = 2
""");
}

public override async Task Column_collection_index_int(bool async)
{
await base.Column_collection_index_int(async);
Expand Down
31 changes: 31 additions & 0 deletions test/EFCore.Sqlite.FunctionalTests/Query/PrimitiveCollectionsQuerySqliteTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,37 @@ WHERE json_array_length("p"."Ints") = 2
""");
}

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

AssertSql(
"""
SELECT "p"."Id", "p"."Bool", "p"."Bools", "p"."DateTime", "p"."DateTimes", "p"."Enum", "p"."Enums", "p"."Int", "p"."Ints", "p"."NullableInt", "p"."NullableInts", "p"."NullableString", "p"."NullableStrings", "p"."String", "p"."Strings"
FROM "PrimitiveCollectionsEntity" AS "p"
WHERE (
SELECT COUNT(*)
FROM json_each("p"."Ints") AS "i"
WHERE "i"."value" > 1) = 2
""");
}

// #33932
public override async Task Column_collection_Where_Count(bool async)
{
await base.Column_collection_Where_Count(async);

AssertSql(
"""
SELECT "p"."Id", "p"."Bool", "p"."Bools", "p"."DateTime", "p"."DateTimes", "p"."Enum", "p"."Enums", "p"."Int", "p"."Ints", "p"."NullableInt", "p"."NullableInts", "p"."NullableString", "p"."NullableStrings", "p"."String", "p"."Strings"
FROM "PrimitiveCollectionsEntity" AS "p"
WHERE (
SELECT COUNT(*)
FROM json_each("p"."Ints") AS "i"
WHERE "i"."value" > 1) = 2
""");
}

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