Skip to content

Always add parentheses around regex pattern in generated SQL #3924

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
fritz3n wants to merge 4 commits into
base: main
Choose a base branch
from
+8 −6
Open

Always add parentheses around regex pattern in generated SQL #3924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd52915
Always add parentheses around regex pattern
fritz3n Sep 28, 2026
c32200c
Update tests for changed regex generation
fritz3n Sep 28, 2026
b708a18
Also add parentheses in single-line case
fritz3n Sep 28, 2026
265879a
Fix singleline tests
fritz3n Sep 29, 2026
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
6 changes: 4 additions & 2 deletions src/EFCore.PG/Query/Internal/NpgsqlQuerySqlGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,9 @@ protected virtual Expression VisitRegexMatch(PgRegexMatchExpression expression,
// PG regexps are single-line by default
if (options == RegexOptions.Singleline)
{
Sql.Append("(");
Visit(expression.Pattern);
Sql.Append(")");
Comment thread
fritz3n marked this conversation as resolved.
return expression;
}

Expand Down Expand Up @@ -1011,9 +1013,9 @@ protected virtual Expression VisitRegexMatch(PgRegexMatchExpression expression,

if (constantPattern is null)
{
Sql.Append("' || ");
Sql.Append("' || (");
Visit(expression.Pattern);
Sql.Append(")");
Sql.Append("))");
Comment thread
fritz3n marked this conversation as resolved.
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions test/EFCore.PG.FunctionalTests/Query/NorthwindFunctionsQueryNpgsqlTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ await AssertQuery(

SELECT c."CustomerID", c."Address", c."City", c."CompanyName", c."ContactName", c."ContactTitle", c."Country", c."Fax", c."Phone", c."PostalCode", c."Region"
FROM "Customers" AS c
WHERE c."CompanyName" ~ ('(?p)' || @pattern)
WHERE c."CompanyName" ~ ('(?p)' || (@pattern))
""");
}

Expand Down Expand Up @@ -197,7 +197,7 @@ await AssertQuery(
"""
SELECT c."CustomerID", c."Address", c."City", c."CompanyName", c."ContactName", c."ContactTitle", c."Country", c."Fax", c."Phone", c."PostalCode", c."Region"
FROM "Customers" AS c
WHERE c."CompanyName" ~ '^A'
WHERE c."CompanyName" ~ ('^A')
""");
}

Expand All @@ -213,7 +213,7 @@ await AssertQuery(
"""
SELECT c."CustomerID", c."Address", c."City", c."CompanyName", c."ContactName", c."ContactTitle", c."Country", c."Fax", c."Phone", c."PostalCode", c."Region"
FROM "Customers" AS c
WHERE c."CompanyName" ~* '^a'
WHERE c."CompanyName" ~* ('^a')
""");
}

Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.PG.FunctionalTests/Query/Translations/StringTranslationsNpgsqlTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1579,7 +1579,7 @@ public override async Task Regex_IsMatch_constant_input()
"""
SELECT b."Id", b."Bool", b."Byte", b."ByteArray", b."DateOnly", b."DateTime", b."DateTimeOffset", b."Decimal", b."Double", b."Enum", b."FlagsEnum", b."Float", b."Guid", b."Int", b."Long", b."Short", b."String", b."TimeOnly", b."TimeSpan"
FROM "BasicTypesEntities" AS b
WHERE 'Seattle' ~ ('(?p)' || b."String")
WHERE 'Seattle' ~ ('(?p)' || (b."String"))
""");
}

Expand Down