Implement DbFunctions extensions for websearch_to_tsquery (#629)

QueryBaseline.cs

@@ -4032,3 +4032,19 @@
 
 
 
+System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) : 
+            AssertSql(
+                @"SELECT websearch_to_tsquery('a OR b')
+FROM ""Customers"" AS c
+LIMIT 1");
+
+
+
+System.RuntimeMethodHandle.InvokeMethod(Object target, Object[] arguments, Signature sig, Boolean constructor, Boolean wrapExceptions) : 
+AssertSql(
+@"SELECT websearch_to_tsquery('english', 'a OR b')
+FROM ""Customers"" AS c
+LIMIT 1");
+
+
+

src/EFCore.PG/Extensions/NpgsqlFullTextSearchDbFunctionsExtensions.cs

@@ -10,72 +10,109 @@ public static class NpgsqlFullTextSearchDbFunctionsExtensions
     {
         /// <summary>
         /// Convert <paramref name="lexemes" /> to a tsvector.
-        /// https://www.postgresql.org/docs/current/static/functions-textsearch.html
         /// </summary>
+        /// <remarks>
+        /// https://www.postgresql.org/docs/current/static/functions-textsearch.html
+        /// </remarks>
         public static NpgsqlTsVector ArrayToTsVector(this DbFunctions _, string[] lexemes) =>
             throw new NotSupportedException();
 
         /// <summary>
         /// Reduce <paramref name="document" /> to tsvector.
-        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-DOCUMENTS
         /// </summary>
+        /// <remarks>
+        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-DOCUMENTS
+        /// </remarks>
         public static NpgsqlTsVector ToTsVector(this DbFunctions _, string document) =>
             throw new NotSupportedException();
 
         /// <summary>
         /// Reduce <paramref name="document" /> to tsvector using the text search configuration specified
         /// by <paramref name="config" />.
-        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-DOCUMENTS
         /// </summary>
+        /// <remarks>
+        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-DOCUMENTS
+        /// </remarks>
         public static NpgsqlTsVector ToTsVector(this DbFunctions _, string config, string document) =>
             throw new NotSupportedException();
 
         /// <summary>
         /// Produce tsquery from <paramref name="query" /> ignoring punctuation.
-        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
         /// </summary>
+        /// <remarks>
+        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
+        /// </remarks>
         public static NpgsqlTsQuery PlainToTsQuery(this DbFunctions _, string query) =>
             throw new NotSupportedException();
 
         /// <summary>
         /// Produce tsquery from <paramref name="query" /> ignoring punctuation and using the text search
         /// configuration specified by <paramref name="config" />.
-        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
         /// </summary>
+        /// <remarks>
+        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
+        /// </remarks>
         public static NpgsqlTsQuery PlainToTsQuery(this DbFunctions _, string config, string query) =>
             throw new NotSupportedException();
 
         /// <summary>
         /// Produce tsquery that searches for a phrase from <paramref name="query" /> ignoring punctuation.
-        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
         /// </summary>
+        /// <remarks>
+        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
+        /// </remarks>
         public static NpgsqlTsQuery PhraseToTsQuery(this DbFunctions _, string query) =>
             throw new NotSupportedException();
 
         /// <summary>
         /// Produce tsquery that searches for a phrase from <paramref name="query" /> ignoring punctuation
         /// and using the text search configuration specified by <paramref name="config" />.
-        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
         /// </summary>
+        /// <remarks>
+        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
+        /// </remarks>
         public static NpgsqlTsQuery PhraseToTsQuery(this DbFunctions _, string config, string query) =>
             throw new NotSupportedException();
 
         /// <summary>
         /// Normalize words in <paramref name="query" /> and convert to tsquery. If your input
         /// contains punctuation that should not be treated as text search operators, use
         /// <see cref="PlainToTsQuery(DbFunctions, string)" /> instead.
-        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
         /// </summary>
+        /// <remarks>
+        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
+        /// </remarks>
         public static NpgsqlTsQuery ToTsQuery(this DbFunctions _, string query) => throw new NotSupportedException();
 
         /// <summary>
         /// Normalize words in <paramref name="query" /> and convert to tsquery using the text search
         /// configuration specified by <paramref name="config" />. If your input contains punctuation
         /// that should not be treated as text search operators, use
         /// <see cref="PlainToTsQuery(DbFunctions, string, string)" /> instead.
-        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
         /// </summary>
+        /// <remarks>
+        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
+        /// </remarks>
         public static NpgsqlTsQuery ToTsQuery(this DbFunctions _, string config, string query) =>
             throw new NotSupportedException();
+
+        /// <summary>
+        /// Convert <paramref name="query" /> tsquery using the simplified websearch syntax.
+        /// </summary>
+        /// <remarks>
+        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
+        /// </remarks>
+        public static NpgsqlTsQuery WebSearchToTsQuery(this DbFunctions _, string query) =>
+            throw new NotSupportedException();
+
+        /// <summary>
+        /// Convert <paramref name="query" /> tsquery using the simplified websearch syntax and the text
+        /// search configuration specified by <paramref name="config" />.
+        /// </summary>
+        /// <remarks>
+        /// http://www.postgresql.org/docs/current/static/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
+        /// </remarks>
+        public static NpgsqlTsQuery WebSearchToTsQuery(this DbFunctions _, string config, string query) =>
+            throw new NotSupportedException();
     }
 }

src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlFullTextSearchMethodTranslator.cs

@@ -29,7 +29,8 @@ public class NpgsqlFullTextSearchMethodTranslator : IMethodCallTranslator
             [nameof(NpgsqlFullTextSearchDbFunctionsExtensions.ToTsVector)] = "to_tsvector",
             [nameof(NpgsqlFullTextSearchDbFunctionsExtensions.PlainToTsQuery)] = "plainto_tsquery",
             [nameof(NpgsqlFullTextSearchDbFunctionsExtensions.PhraseToTsQuery)] = "phraseto_tsquery",
-            [nameof(NpgsqlFullTextSearchDbFunctionsExtensions.ToTsQuery)] = "to_tsquery"
+            [nameof(NpgsqlFullTextSearchDbFunctionsExtensions.ToTsQuery)] = "to_tsquery",
+            [nameof(NpgsqlFullTextSearchDbFunctionsExtensions.WebSearchToTsQuery)] = "websearch_to_tsquery"
         };
 
         /// <inheritdoc />

test/EFCore.PG.FunctionalTests/Query/FullTextSearchDbFunctionsNpgsqlTest.cs

@@ -268,6 +268,36 @@ SELECT to_tsquery(CAST(@__config_1 AS regconfig), 'a & b')
 LIMIT 1");
         }
 
+        [Fact]
+        public void WebSearchToTsQuery()
+        {
+            using (var context = CreateContext())
+            {
+                var tsquery = context.Customers.Select(c => EF.Functions.WebSearchToTsQuery("a OR b")).First();
+                Assert.NotNull(tsquery);
+            }
+
+            AssertSql(
+                @"SELECT websearch_to_tsquery('a OR b')
+FROM ""Customers"" AS c
+LIMIT 1");
+        }
+
+        [Fact]
+        public void WebSearchToTsQuery_With_Config()
+        {
+            using (var context = CreateContext())
+            {
+                var tsquery = context.Customers.Select(c => EF.Functions.WebSearchToTsQuery("english", "a OR b")).First();
+                Assert.NotNull(tsquery);
+            }
+
+            AssertSql(
+                @"SELECT websearch_to_tsquery('english', 'a OR b')
+FROM ""Customers"" AS c
+LIMIT 1");
+        }
+
         [Fact]
         public void TsQueryAnd()
         {