Skip to content

Patch for custom binary operators that use standard comparison symbols #426

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 2 commits into from
May 26, 2018
Merged

Patch for custom binary operators that use standard comparison symbols #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e5de94
Patch for custom binary operators that use standard comparison symbols
austindrenski May 25, 2018
87a418b
Update to always wrap a custom binary expression in parenthesis
austindrenski May 26, 2018
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
218 changes: 218 additions & 0 deletions QueryBaseline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3796,3 +3796,221 @@



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (o.""OrderDate"" + MAKE_INTERVAL(secs => 1)) AS ""OrderDate""
FROM ""Orders"" AS o
WHERE o.""OrderDate"" IS NOT NULL");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (o.""OrderDate"" + MAKE_INTERVAL(years => 1)) AS ""OrderDate""
FROM ""Orders"" AS o
WHERE o.""OrderDate"" IS NOT NULL");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (o.""OrderDate"" + MAKE_INTERVAL(mins => 1)) AS ""OrderDate""
FROM ""Orders"" AS o
WHERE o.""OrderDate"" IS NOT NULL");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"@__years_0='2'

SELECT (o.""OrderDate"" + MAKE_INTERVAL(years => @__years_0)) AS ""OrderDate""
FROM ""Orders"" AS o
WHERE o.""OrderDate"" IS NOT NULL");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (o.""OrderDate"" + MAKE_INTERVAL(months => 1)) AS ""OrderDate""
FROM ""Orders"" AS o
WHERE o.""OrderDate"" IS NOT NULL");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (o.""OrderDate"" + MAKE_INTERVAL(hours => 1)) AS ""OrderDate""
FROM ""Orders"" AS o
WHERE o.""OrderDate"" IS NOT NULL");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (to_tsquery('a & b') && to_tsquery('c & d'))
FROM ""Customers"" AS c
LIMIT 1");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (to_tsquery('a & b') || to_tsquery('c & d'))
FROM ""Customers"" AS c
LIMIT 1");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (to_tsvector('a') @@ 'b')
FROM ""Customers"" AS c
LIMIT 1");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (to_tsvector('a') @@ to_tsquery('b'))
FROM ""Customers"" AS c
LIMIT 1");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (to_tsquery('b') <@ to_tsquery('a & b'))
FROM ""Customers"" AS c
LIMIT 1");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (to_tsquery('a & b') @> to_tsquery('b'))
FROM ""Customers"" AS c
LIMIT 1");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (to_tsvector('b') || to_tsvector('c'))
FROM ""Customers"" AS c
LIMIT 1");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (to_tsquery('a & b') && to_tsquery('c & d'))
FROM ""Customers"" AS c
LIMIT 1");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (to_tsquery('a & b') || to_tsquery('c & d'))
FROM ""Customers"" AS c
LIMIT 1");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (to_tsvector('a') @@ 'b')
FROM ""Customers"" AS c
LIMIT 1");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (to_tsvector('a') @@ to_tsquery('b'))
FROM ""Customers"" AS c
LIMIT 1");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (to_tsquery('b') <@ to_tsquery('a & b'))
FROM ""Customers"" AS c
LIMIT 1");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (to_tsquery('a & b') @> to_tsquery('b'))
FROM ""Customers"" AS c
LIMIT 1");



System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) :
AssertSql(
@"SELECT (to_tsvector('b') || to_tsvector('c'))
FROM ""Customers"" AS c
LIMIT 1");



Npgsql.EntityFrameworkCore.PostgreSQL.Query.FullTextSearchDbFunctionsNpgsqlTest.TsQueryAnd() :
AssertSql(
@"SELECT (to_tsquery('a & b') && to_tsquery('c & d'))
FROM ""Customers"" AS c
LIMIT 1");



Npgsql.EntityFrameworkCore.PostgreSQL.Query.FullTextSearchDbFunctionsNpgsqlTest.TsQueryOr() :
AssertSql(
@"SELECT (to_tsquery('a & b') || to_tsquery('c & d'))
FROM ""Customers"" AS c
LIMIT 1");



Npgsql.EntityFrameworkCore.PostgreSQL.Query.FullTextSearchDbFunctionsNpgsqlTest.Matches_With_String() :
AssertSql(
@"SELECT (to_tsvector('a') @@ 'b')
FROM ""Customers"" AS c
LIMIT 1");



Npgsql.EntityFrameworkCore.PostgreSQL.Query.FullTextSearchDbFunctionsNpgsqlTest.Matches_With_Tsquery() :
AssertSql(
@"SELECT (to_tsvector('a') @@ to_tsquery('b'))
FROM ""Customers"" AS c
LIMIT 1");



Npgsql.EntityFrameworkCore.PostgreSQL.Query.FullTextSearchDbFunctionsNpgsqlTest.TsQueryIsContainedIn() :
AssertSql(
@"SELECT (to_tsquery('b') <@ to_tsquery('a & b'))
FROM ""Customers"" AS c
LIMIT 1");



Npgsql.EntityFrameworkCore.PostgreSQL.Query.FullTextSearchDbFunctionsNpgsqlTest.TsQueryContains() :
AssertSql(
@"SELECT (to_tsquery('a & b') @> to_tsquery('b'))
FROM ""Customers"" AS c
LIMIT 1");



Npgsql.EntityFrameworkCore.PostgreSQL.Query.FullTextSearchDbFunctionsNpgsqlTest.TsVectorConcat() :
AssertSql(
@"SELECT (to_tsvector('b') || to_tsvector('c'))
FROM ""Customers"" AS c
LIMIT 1");



6 changes: 4 additions & 2 deletions src/EFCore.PG/Query/Sql/Internal/NpgsqlQuerySqlGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,11 +322,13 @@ public virtual Expression VisitCustomBinary(CustomBinaryExpression expression)
{
Check.NotNull(expression, nameof(expression));

Sql.Append('(');
Visit(expression.Left);
Sql.Append(" ");
Sql.Append(' ');
Sql.Append(expression.Operator);
Sql.Append(" ");
Sql.Append(' ');
Visit(expression.Right);
Sql.Append(')');

return expression;
}
Expand Down
14 changes: 7 additions & 7 deletions test/EFCore.PG.FunctionalTests/Query/FullTextSearchDbFunctionsNpgsqlTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public void TsQueryAnd()
}

AssertSql(
@"SELECT to_tsquery('a & b') && to_tsquery('c & d')
@"SELECT (to_tsquery('a & b') && to_tsquery('c & d'))
FROM ""Customers"" AS c
LIMIT 1");
}
Expand All @@ -225,7 +225,7 @@ public void TsQueryOr()
}

AssertSql(
@"SELECT to_tsquery('a & b') || to_tsquery('c & d')
@"SELECT (to_tsquery('a & b') || to_tsquery('c & d'))
FROM ""Customers"" AS c
LIMIT 1");
}
Expand Down Expand Up @@ -259,7 +259,7 @@ public void TsQueryContains()
}

AssertSql(
@"SELECT to_tsquery('a & b') @> to_tsquery('b')
@"SELECT (to_tsquery('a & b') @> to_tsquery('b'))
FROM ""Customers"" AS c
LIMIT 1");
}
Expand All @@ -276,7 +276,7 @@ public void TsQueryIsContainedIn()
}

AssertSql(
@"SELECT to_tsquery('b') <@ to_tsquery('a & b')
@"SELECT (to_tsquery('b') <@ to_tsquery('a & b'))
FROM ""Customers"" AS c
LIMIT 1");
}
Expand Down Expand Up @@ -436,7 +436,7 @@ public void Matches_With_String()
}

AssertSql(
@"SELECT to_tsvector('a') @@ 'b'
@"SELECT (to_tsvector('a') @@ 'b')
FROM ""Customers"" AS c
LIMIT 1");
}
Expand All @@ -453,7 +453,7 @@ public void Matches_With_Tsquery()
}

AssertSql(
@"SELECT to_tsvector('a') @@ to_tsquery('b')
@"SELECT (to_tsvector('a') @@ to_tsquery('b'))
FROM ""Customers"" AS c
LIMIT 1");
}
Expand All @@ -470,7 +470,7 @@ public void TsVectorConcat()
}

AssertSql(
@"SELECT to_tsvector('b') || to_tsvector('c')
@"SELECT (to_tsvector('b') || to_tsvector('c'))
FROM ""Customers"" AS c
LIMIT 1");
}
Expand Down
Loading