Skip to content

Fix nullability for IndexOf (array_position) #3477

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
roji merged 1 commit into from
Feb 28, 2025
+18 −7
Merged

Fix nullability for IndexOf (array_position) #3477

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
10 changes: 8 additions & 2 deletions src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlArrayMethodTranslator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,10 @@ static bool IsMappedToNonArray(SqlExpression arrayOrList)
"array_position",
[array, item],
nullable: true,
TrueArrays[2],
// array_position can return NULL even if both its arguments are non-nullable;
// this is currently the way to express that (see
// https://github.com/dotnet/efcore/pull/33814#issuecomment-2687857927).
FalseArrays[2],
arrayOrList.Type),
_sqlExpressionFactory.Constant(1)),
_sqlExpressionFactory.Constant(-1));
Expand All @@ -161,7 +164,10 @@ static bool IsMappedToNonArray(SqlExpression arrayOrList)
"array_position",
[array, item, startIndex],
nullable: true,
TrueArrays[3],
// array_position can return NULL even if both its arguments are non-nullable;
// this is currently the way to express that (see
// https://github.com/dotnet/efcore/pull/33814#issuecomment-2687857927).
FalseArrays[3],
arrayOrList.Type),
_sqlExpressionFactory.Constant(1)),
_sqlExpressionFactory.Constant(-1));
Expand Down
7 changes: 6 additions & 1 deletion src/EFCore.PG/Utilities/Util.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,10 @@ internal static class Statics
[true, true, true, true, true, true, true, true]
];

internal static readonly bool[][] FalseArrays = [[], [false], [false, false]];
internal static readonly bool[][] FalseArrays = [
[],
[false],
[false, false],
[false, false, false]
];
}
4 changes: 2 additions & 2 deletions test/EFCore.PG.FunctionalTests/Query/ArrayArrayQueryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ await AssertQuery(
"""
SELECT s."Id", s."ArrayContainerEntityId", s."ArrayOfStringConvertedToDelimitedString", s."Byte", s."ByteArray", s."Bytea", s."EnumConvertedToInt", s."EnumConvertedToString", s."IList", s."IntArray", s."IntList", s."ListOfStringConvertedToDelimitedString", s."NonNullableText", s."NullableEnumConvertedToString", s."NullableEnumConvertedToStringWithNonNullableLambda", s."NullableIntArray", s."NullableIntList", s."NullableStringArray", s."NullableStringList", s."NullableText", s."StringArray", s."StringList", s."ValueConvertedArrayOfEnum", s."ValueConvertedListOfEnum", s."Varchar10", s."Varchar15"
FROM "SomeEntities" AS s
WHERE array_position(s."IntArray", 6) - 1 = 1
WHERE COALESCE(array_position(s."IntArray", 6) - 1, -1) = 1
""");
}

Expand All @@ -849,7 +849,7 @@ await AssertQuery(
"""
SELECT s."Id", s."ArrayContainerEntityId", s."ArrayOfStringConvertedToDelimitedString", s."Byte", s."ByteArray", s."Bytea", s."EnumConvertedToInt", s."EnumConvertedToString", s."IList", s."IntArray", s."IntList", s."ListOfStringConvertedToDelimitedString", s."NonNullableText", s."NullableEnumConvertedToString", s."NullableEnumConvertedToStringWithNonNullableLambda", s."NullableIntArray", s."NullableIntList", s."NullableStringArray", s."NullableStringList", s."NullableText", s."StringArray", s."StringList", s."ValueConvertedArrayOfEnum", s."ValueConvertedListOfEnum", s."Varchar10", s."Varchar15"
FROM "SomeEntities" AS s
WHERE array_position(s."IntArray", 6, 2) - 1 = 1
WHERE COALESCE(array_position(s."IntArray", 6, 2) - 1, -1) = 1
""");
}

Expand Down
4 changes: 2 additions & 2 deletions test/EFCore.PG.FunctionalTests/Query/ArrayListQueryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,7 @@ await AssertQuery(
"""
SELECT s."Id", s."ArrayContainerEntityId", s."ArrayOfStringConvertedToDelimitedString", s."Byte", s."ByteArray", s."Bytea", s."EnumConvertedToInt", s."EnumConvertedToString", s."IList", s."IntArray", s."IntList", s."ListOfStringConvertedToDelimitedString", s."NonNullableText", s."NullableEnumConvertedToString", s."NullableEnumConvertedToStringWithNonNullableLambda", s."NullableIntArray", s."NullableIntList", s."NullableStringArray", s."NullableStringList", s."NullableText", s."StringArray", s."StringList", s."ValueConvertedArrayOfEnum", s."ValueConvertedListOfEnum", s."Varchar10", s."Varchar15"
FROM "SomeEntities" AS s
WHERE array_position(s."IntList", 6) - 1 = 1
WHERE COALESCE(array_position(s."IntList", 6) - 1, -1) = 1
""");
}

Expand All @@ -872,7 +872,7 @@ await AssertQuery(
"""
SELECT s."Id", s."ArrayContainerEntityId", s."ArrayOfStringConvertedToDelimitedString", s."Byte", s."ByteArray", s."Bytea", s."EnumConvertedToInt", s."EnumConvertedToString", s."IList", s."IntArray", s."IntList", s."ListOfStringConvertedToDelimitedString", s."NonNullableText", s."NullableEnumConvertedToString", s."NullableEnumConvertedToStringWithNonNullableLambda", s."NullableIntArray", s."NullableIntList", s."NullableStringArray", s."NullableStringList", s."NullableText", s."StringArray", s."StringList", s."ValueConvertedArrayOfEnum", s."ValueConvertedListOfEnum", s."Varchar10", s."Varchar15"
FROM "SomeEntities" AS s
WHERE array_position(s."IntList", 6, 2) - 1 = 1
WHERE COALESCE(array_position(s."IntList", 6, 2) - 1, -1) = 1
""");
}

Expand Down