Skip to content

Fix null value handling for primitive collections with nullable type #37539

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

Open
PashaPash wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix null value handling for primitive collections with nullable type #37539

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
15 changes: 14 additions & 1 deletion src/EFCore.Relational/Query/SqlNullabilityProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1910,7 +1910,20 @@ protected virtual bool TryMakeNonNullable(
throw new UnreachableException($"Parameter '{collectionParameter.Name}' is not an IEnumerable.");
}

var values = enumerable.Cast<object?>().ToList();
IList values;
if (enumerable.GetType().GetInterfaces().FirstOrDefault(
i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IEnumerable<>)
) is { } genericEnumerableInterface)
{
var elementType = genericEnumerableInterface.GetGenericArguments()[0];
var toListMethod = typeof(Enumerable).GetMethod(nameof(Enumerable.ToList))!.MakeGenericMethod(elementType);
values = (IList)toListMethod.Invoke(null, [ enumerable ])!;
}
else
{
values = enumerable.Cast<object?>().ToList();
}

IList? processedValues = null;

for (var i = 0; i < values.Count; i++)
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 @@ -481,6 +481,20 @@ WHERE ARRAY_CONTAINS(@Select, c["NullableString"])
""");
}

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

AssertSql(
"""
@data='[null,1]'

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

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 @@ -245,6 +245,16 @@ public virtual Task Inline_collection_Contains_with_IEnumerable_EF_Parameter()
ss => ss.Set<PrimitiveCollectionsEntity>().Where(c => data.Select(x => x).Contains(c.NullableString)));
}

[ConditionalFact]
public virtual Task Inline_collection_Contains_with_Nullable_Int_IEnumerable_Array_Containing_Null_EF_Parameter()
{
int?[] data = [ null, 1 ];

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

[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 @@ -460,6 +460,9 @@ public override Task 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_Contains_with_Nullable_Int_IEnumerable_Array_Containing_Null_EF_Parameter()
=> AssertCompatibilityLevelTooLow(() => base.Inline_collection_Contains_with_Nullable_Int_IEnumerable_Array_Containing_Null_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 @@ -454,6 +454,23 @@ FROM OPENJSON(@Select) WITH ([value] nvarchar(max) '$') AS [s]
""");
}

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

AssertSql(
"""
@data_without_nulls='[1]' (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].[NullableInt] IN (
SELECT [d].[value]
FROM OPENJSON(@data_without_nulls) AS [d]
) OR [p].[NullableInt] IS NULL
""");
}

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 @@ -598,6 +598,23 @@ FROM OPENJSON(@Select) WITH ([value] nvarchar(max) '$') AS [s]
""");
}

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

AssertSql(
"""
@data_without_nulls='[1]' (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].[NullableInt] IN (
SELECT [d].[value]
FROM OPENJSON(@data_without_nulls) AS [d]
) OR [p].[NullableInt] IS NULL
""");
}

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 @@ -477,6 +477,23 @@ FROM OPENJSON(@Select) WITH ([value] nvarchar(max) '$') AS [s]
""");
}

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

AssertSql(
"""
@data_without_nulls='[1]' (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].[NullableInt] IN (
SELECT [d].[value]
FROM OPENJSON(@data_without_nulls) AS [d]
) OR [p].[NullableInt] IS NULL
""");
}

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 @@ -465,6 +465,23 @@ FROM json_each(@Select) AS "s"
""");
}

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

AssertSql(
"""
@data_without_nulls='[1]' (Size = 3)

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"."NullableInt" IN (
SELECT "d"."value"
FROM json_each(@data_without_nulls) AS "d"
) OR "p"."NullableInt" IS NULL
""");
}

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
Loading