Skip to content

[release/10.0] Fix Parameter for primitive collections for IEnumerable with nullable type #37257

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
cincuranet merged 1 commit into from
Dec 2, 2025
Merged

[release/10.0] Fix Parameter for primitive collections for IEnumerable with nullable type #37257

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
21 changes: 19 additions & 2 deletions src/EFCore.Relational/Query/SqlNullabilityProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ namespace Microsoft.EntityFrameworkCore.Query;
/// </summary>
public class SqlNullabilityProcessor : ExpressionVisitor
{
private static readonly bool UseOldBehavior37204 =
AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue37204", out var enabled) && enabled;

private readonly List<ColumnExpression> _nonNullableColumns;
private readonly List<ColumnExpression> _nullValueColumns;
private readonly ISqlExpressionFactory _sqlExpressionFactory;
Expand Down Expand Up @@ -1858,9 +1861,23 @@ protected virtual bool TryMakeNonNullable(
{
// We're looking at a parameter beyond its simple nullability, so we can't use the SQL cache for this query.
var parameters = ParametersDecorator.GetAndDisableCaching();
if (parameters[collectionParameter.Name] is not IList values)

IList values;
if (UseOldBehavior37204)
{
throw new UnreachableException($"Parameter '{collectionParameter.Name}' is not an IList.");
if (parameters[collectionParameter.Name] is not IList list)
{
throw new UnreachableException($"Parameter '{collectionParameter.Name}' is not an IList.");
}
values = list;
}
else
{
if (parameters[collectionParameter.Name] is not IEnumerable enumerable)
{
throw new UnreachableException($"Parameter '{collectionParameter.Name}' is not an IEnumerable.");
}
values = enumerable.Cast<object?>().ToList();
}

IList? processedValues = null;
Expand Down
14 changes: 14 additions & 0 deletions test/EFCore.Cosmos.FunctionalTests/Query/PrimitiveCollectionsQueryCosmosTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,20 @@ WHERE ARRAY_CONTAINS(@p, c["Id"])
""");
}

public override async Task Inline_collection_Contains_with_IEnumerable_EF_Parameter()
{
await base.Inline_collection_Contains_with_IEnumerable_EF_Parameter();

AssertSql(
"""
@Select='["10","a","aa"]'

SELECT VALUE c
FROM root c
WHERE ARRAY_CONTAINS(@Select, c["NullableString"])
""");
}

public override async Task Inline_collection_Count_with_column_predicate_with_EF_Parameter()
{
await base.Inline_collection_Count_with_column_predicate_with_EF_Parameter();
Expand Down
10 changes: 10 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 @@ -226,6 +226,16 @@ public virtual Task Inline_collection_Contains_with_EF_Parameter()
ss => ss.Set<PrimitiveCollectionsEntity>().Where(c => EF.Parameter(new[] { 2, 999, 1000 }).Contains(c.Id)),
ss => ss.Set<PrimitiveCollectionsEntity>().Where(c => new[] { 2, 999, 1000 }.Contains(c.Id)));

[ConditionalFact]
public virtual Task Inline_collection_Contains_with_IEnumerable_EF_Parameter()
{
List<string?> data = ["10", "a", "aa",];

return AssertQuery(
ss => ss.Set<PrimitiveCollectionsEntity>().Where(c => EF.Parameter(data.Select(x => x)).Contains(c.NullableString)),
ss => ss.Set<PrimitiveCollectionsEntity>().Where(c => data.Select(x => x).Contains(c.NullableString)));
}

[ConditionalFact]
public virtual Task Inline_collection_Count_with_column_predicate_with_EF_Parameter()
=> AssertQuery(
Expand Down
3 changes: 3 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 @@ -457,6 +457,9 @@ SELECT COUNT(*)
public override Task Inline_collection_Contains_with_EF_Parameter()
=> AssertCompatibilityLevelTooLow(() => base.Inline_collection_Contains_with_EF_Parameter());

public override Task Inline_collection_Contains_with_IEnumerable_EF_Parameter()
=> AssertCompatibilityLevelTooLow(() => base.Inline_collection_Contains_with_IEnumerable_EF_Parameter());

public override Task Inline_collection_Count_with_column_predicate_with_EF_Parameter()
=> AssertCompatibilityLevelTooLow(() => base.Inline_collection_Count_with_column_predicate_with_EF_Parameter());

Expand Down
17 changes: 17 additions & 0 deletions test/EFCore.SqlServer.FunctionalTests/Query/PrimitiveCollectionsQuerySqlServer160Test.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,23 @@ FROM OPENJSON(@p) WITH ([value] int '$') AS [p0]
""");
}

public override async Task Inline_collection_Contains_with_IEnumerable_EF_Parameter()
{
await base.Inline_collection_Contains_with_IEnumerable_EF_Parameter();

AssertSql(
"""
@Select='["10","a","aa"]' (Size = 4000)

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].[NullableWrappedId], [p].[NullableWrappedIdWithNullableComparer], [p].[String], [p].[Strings], [p].[WrappedId]
FROM [PrimitiveCollectionsEntity] AS [p]
WHERE [p].[NullableString] IN (
SELECT [s].[value]
FROM OPENJSON(@Select) WITH ([value] nvarchar(max) '$') AS [s]
)
""");
}

public override async Task Inline_collection_Count_with_column_predicate_with_EF_Parameter()
{
await base.Inline_collection_Count_with_column_predicate_with_EF_Parameter();
Expand Down
17 changes: 17 additions & 0 deletions .../EFCore.SqlServer.FunctionalTests/Query/PrimitiveCollectionsQuerySqlServerJsonTypeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,23 @@ FROM OPENJSON(@p) WITH ([value] int '$') AS [p0]
""");
}

public override async Task Inline_collection_Contains_with_IEnumerable_EF_Parameter()
{
await base.Inline_collection_Contains_with_IEnumerable_EF_Parameter();

AssertSql(
"""
@Select='["10","a","aa"]' (Size = 4000)

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].[NullableWrappedId], [p].[NullableWrappedIdWithNullableComparer], [p].[String], [p].[Strings], [p].[WrappedId]
FROM [PrimitiveCollectionsEntity] AS [p]
WHERE [p].[NullableString] IN (
SELECT [s].[value]
FROM OPENJSON(@Select) WITH ([value] nvarchar(max) '$') AS [s]
)
""");
}

public override async Task Inline_collection_Count_with_column_predicate_with_EF_Parameter()
{
await base.Inline_collection_Count_with_column_predicate_with_EF_Parameter();
Expand Down
17 changes: 17 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 @@ -460,6 +460,23 @@ FROM OPENJSON(@p) WITH ([value] int '$') AS [p0]
""");
}

public override async Task Inline_collection_Contains_with_IEnumerable_EF_Parameter()
{
await base.Inline_collection_Contains_with_IEnumerable_EF_Parameter();

AssertSql(
"""
@Select='["10","a","aa"]' (Size = 4000)

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].[NullableWrappedId], [p].[NullableWrappedIdWithNullableComparer], [p].[String], [p].[Strings], [p].[WrappedId]
FROM [PrimitiveCollectionsEntity] AS [p]
WHERE [p].[NullableString] IN (
SELECT [s].[value]
FROM OPENJSON(@Select) WITH ([value] nvarchar(max) '$') AS [s]
)
""");
}

public override async Task Inline_collection_Count_with_column_predicate_with_EF_Parameter()
{
await base.Inline_collection_Count_with_column_predicate_with_EF_Parameter();
Expand Down
17 changes: 17 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 @@ -448,6 +448,23 @@ FROM json_each(@p) AS "p0"
""");
}

public override async Task Inline_collection_Contains_with_IEnumerable_EF_Parameter()
{
await base.Inline_collection_Contains_with_IEnumerable_EF_Parameter();

AssertSql(
"""
@Select='["10","a","aa"]' (Size = 15)

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"."NullableWrappedId", "p"."NullableWrappedIdWithNullableComparer", "p"."String", "p"."Strings", "p"."WrappedId"
FROM "PrimitiveCollectionsEntity" AS "p"
WHERE "p"."NullableString" IN (
SELECT "s"."value"
FROM json_each(@Select) AS "s"
)
""");
}

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