From cb1b8e9764f891d0ec7b27ead3f32a0496296582 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Sun, 27 Nov 2022 09:26:10 -0500 Subject: [PATCH] fix: Improved search engine-like behavior for text queries --- server/models/helpers/SearchHelper.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/models/helpers/SearchHelper.ts b/server/models/helpers/SearchHelper.ts index 38e2206da..96ed98b9f 100644 --- a/server/models/helpers/SearchHelper.ts +++ b/server/models/helpers/SearchHelper.ts @@ -103,7 +103,7 @@ export default class SearchHelper { // Build the SQL query to get result documentIds, ranking, and search term context const whereClause = ` - "searchVector" @@ to_tsquery('english', :query) AND + "searchVector" @@ websearch_to_tsquery('english', :query) AND "teamId" = :teamId AND "collectionId" IN(:collectionIds) AND ${documentClause} @@ -113,8 +113,8 @@ export default class SearchHelper { const selectSql = ` SELECT id, - ts_rank(documents."searchVector", to_tsquery('english', :query)) as "searchRanking", - ts_headline('english', "text", to_tsquery('english', :query), :headlineOptions) as "searchContext" + ts_rank(documents."searchVector", websearch_to_tsquery('english', :query)) as "searchRanking", + ts_headline('english', "text", websearch_to_tsquery('english', :query), :headlineOptions) as "searchContext" FROM documents WHERE ${whereClause} ORDER BY @@ -197,7 +197,7 @@ export default class SearchHelper { // Build the SQL query to get documentIds, ranking, and search term context const whereClause = ` - "searchVector" @@ to_tsquery('english', :query) AND + "searchVector" @@ websearch_to_tsquery('english', :query) AND "teamId" = :teamId AND ${ collectionIds.length @@ -226,8 +226,8 @@ export default class SearchHelper { const selectSql = ` SELECT id, - ts_rank(documents."searchVector", to_tsquery('english', :query)) as "searchRanking", - ts_headline('english', "text", to_tsquery('english', :query), :headlineOptions) as "searchContext" + ts_rank(documents."searchVector", websearch_to_tsquery('english', :query)) as "searchRanking", + ts_headline('english', "text", websearch_to_tsquery('english', :query), :headlineOptions) as "searchContext" FROM documents WHERE ${whereClause} ORDER BY