Skip to content

Fix TargetInvocationException with nullable value types with HasConversion #3843

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
henriquewr wants to merge 1 commit into
base: main
Choose a base branch
from
+41 −10
Open

Fix TargetInvocationException with nullable value types with HasConversion #3843

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
17 changes: 14 additions & 3 deletions src/EFCore.PG/Storage/Internal/Mapping/NpgsqlArrayTypeMapping.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,21 @@ private static RelationalTypeMappingParameters CreateParameters(string storeType
#pragma warning restore EF1001

var elementJsonReaderWriter = elementMapping.JsonValueReaderWriter;
if (elementJsonReaderWriter is not null && !typeof(TElement).UnwrapNullableType().IsAssignableTo(elementJsonReaderWriter.ValueType))

if (elementJsonReaderWriter is not null)
{
throw new InvalidOperationException(
$"When building an array mapping over '{typeof(TElement).Name}', the JsonValueReaderWriter for element mapping '{elementMapping.GetType().Name}' is incorrect ('{elementJsonReaderWriter.ValueType.Name}' instead of '{typeof(TElement).UnwrapNullableType()}', the JsonValueReaderWriter is '{elementJsonReaderWriter.GetType().Name}').");
if (!typeof(TElement).UnwrapNullableType().IsAssignableTo(elementJsonReaderWriter.ValueType))
{
throw new InvalidOperationException(
$"When building an array mapping over '{typeof(TElement).Name}', the JsonValueReaderWriter for element mapping '{elementMapping.GetType().Name}' is incorrect ('{elementJsonReaderWriter.ValueType.Name}' instead of '{typeof(TElement).UnwrapNullableType()}', the JsonValueReaderWriter is '{elementJsonReaderWriter.GetType().Name}').");
}

if (elementJsonReaderWriter.ValueType.IsNullableValueType()
|| !elementJsonReaderWriter.ValueType.IsAssignableFrom(elementType.UnwrapNullableType()))
{
elementJsonReaderWriter = (JsonValueReaderWriter)Activator.CreateInstance(
typeof(JsonCastValueReaderWriter<>).MakeGenericType(elementType.UnwrapNullableType()), elementJsonReaderWriter)!;
}
}

// If there's no JsonValueReaderWriter on the element, we also don't set one on its array (this is for rare edge cases such as
Expand Down
34 changes: 27 additions & 7 deletions test/EFCore.PG.FunctionalTests/Query/PrimitiveCollectionsQueryNpgsqlTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ WHERE GREATEST(30, p."NullableInt", NULL) = 30
""");
}

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

Expand Down Expand Up @@ -1438,7 +1438,7 @@ public override async Task Column_collection_ElementAt()
""");
}

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

Expand Down Expand Up @@ -1534,7 +1534,7 @@ public override async Task Column_collection_Skip_Take()
""");
}

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

Expand Down Expand Up @@ -2486,7 +2486,7 @@ WHERE cardinality(array_remove(p."Ints", 1)) = 1
""");
}

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

Expand Down Expand Up @@ -2562,9 +2562,29 @@ WHERE NOT (p."NullableWrappedId" = ANY (@values) AND p."NullableWrappedId" = ANY
""");
}

public override Task Parameter_collection_of_nullable_structs_Contains_nullable_struct_with_nullable_comparer()
=> Assert.ThrowsAnyAsync<TargetInvocationException>(
() => base.Parameter_collection_of_nullable_structs_Contains_nullable_struct_with_nullable_comparer());
public override async Task Parameter_collection_of_nullable_structs_Contains_nullable_struct_with_nullable_comparer()
{
await base.Parameter_collection_of_nullable_structs_Contains_nullable_struct_with_nullable_comparer();

AssertSql(
"""
@values={ NULL
'22' } (DbType = Object)

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."NullableWrappedIdWithNullableComparer" = ANY (@values) OR (p."NullableWrappedIdWithNullableComparer" IS NULL AND array_position(@values, NULL) IS NOT NULL)
""",
//
"""
@values={ '11'
'44' } (DbType = Object)

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 NOT (p."NullableWrappedIdWithNullableComparer" = ANY (@values) AND p."NullableWrappedIdWithNullableComparer" = ANY (@values) IS NOT NULL) AND (p."NullableWrappedIdWithNullableComparer" IS NOT NULL OR array_position(@values, NULL) IS NULL)
""");
}


public override async Task Inline_collection_Contains_with_IEnumerable_EF_Parameter()
Expand Down