Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 20 additions & 2 deletions src/EFCore.PG/Query/Internal/NpgsqlQuerySqlGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ protected override void GenerateValues(ValuesExpression valuesExpression)
/// </summary>
protected virtual Expression VisitArrayAll(PgAllExpression expression)
{
Visit(expression.Item);
VisitArrayOperatorItem(expression, expression.Item);

Sql
.Append(" ")
Expand Down Expand Up @@ -873,7 +873,7 @@ protected virtual Expression VisitArrayAll(PgAllExpression expression)
/// </summary>
protected virtual Expression VisitArrayAny(PgAnyExpression expression)
{
Visit(expression.Item);
VisitArrayOperatorItem(expression, expression.Item);

Sql
.Append(" ")
Expand All @@ -894,6 +894,24 @@ protected virtual Expression VisitArrayAny(PgAnyExpression expression)
return expression;
}

// The item is the left operand of the operator, e.g. (a AND b) = ANY (array).
private void VisitArrayOperatorItem(SqlExpression expression, SqlExpression item)
{
var requiresParentheses = RequiresParentheses(expression, item);

if (requiresParentheses)
{
Sql.Append("(");
}

Visit(item);

if (requiresParentheses)
{
Sql.Append(")");
}
}

/// <summary>
/// Produces SQL array index expression (e.g. arr[1]).
/// </summary>
Expand Down
17 changes: 17 additions & 0 deletions test/EFCore.PG.FunctionalTests/Query/ArrayArrayQueryTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,23 @@ public virtual async Task Array_param_Contains_non_nullable_column()
""");
}

[ConditionalFact]
public virtual async Task Array_param_Contains_logical_expression()
{
var array = new[] { false };

await AssertQuery(ss => ss.Set<ArrayEntity>().Where(e => array.Contains(e.Id == 1 && e.NonNullableText == "foo")));

AssertSql(
"""
@array={ 'False' } (DbType = Object)

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 (s."Id" = 1 AND s."NonNullableText" = 'foo') = ANY (@array)
""");
}

[ConditionalFact]
public virtual void Array_param_with_null_Contains_non_nullable_not_found()
{
Expand Down
17 changes: 17 additions & 0 deletions test/EFCore.PG.FunctionalTests/Query/ArrayListQueryTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,23 @@ public virtual async Task Array_param_Contains_non_nullable_column()
""");
}

[ConditionalFact]
public virtual async Task Array_param_Contains_logical_expression()
{
var array = new List<bool> { false };

await AssertQuery(ss => ss.Set<ArrayEntity>().Where(e => array.Contains(e.Id == 1 && e.NonNullableText == "foo")));

AssertSql(
"""
@array={ 'False' } (DbType = Object)

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 (s."Id" = 1 AND s."NonNullableText" = 'foo') = ANY (@array)
""");
}

public void Array_param_with_null_Contains_non_nullable_not_found()
{
using var ctx = CreateContext();
Expand Down
Loading