From 04d43b072c541670a6650acdee38004c0edcde51 Mon Sep 17 00:00:00 2001 From: Miguel de la Cruz Date: Tue, 13 Aug 2019 15:48:06 +0200 Subject: [PATCH] [MM-17758] Explicits the search configuration when using full text search in postgres (#11870) --- store/sqlstore/channel_store.go | 2 +- store/sqlstore/post_store.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go index d4f3d3c2d5..78d37f3470 100644 --- a/store/sqlstore/channel_store.go +++ b/store/sqlstore/channel_store.go @@ -2248,7 +2248,7 @@ func (s SqlChannelStore) buildFulltextClause(term string, searchColumns string) fulltextTerm = strings.Join(splitTerm, " ") - fulltextClause = fmt.Sprintf("((to_tsvector('english', %s)) @@ to_tsquery(:FulltextTerm))", convertMySQLFullTextColumnsToPostgres(searchColumns)) + fulltextClause = fmt.Sprintf("((to_tsvector('english', %s)) @@ to_tsquery('english', :FulltextTerm))", convertMySQLFullTextColumnsToPostgres(searchColumns)) } else if s.DriverName() == model.DATABASE_DRIVER_MYSQL { splitTerm := strings.Fields(fulltextTerm) for i, t := range strings.Fields(fulltextTerm) { diff --git a/store/sqlstore/post_store.go b/store/sqlstore/post_store.go index d152553c69..521f64ce9e 100644 --- a/store/sqlstore/post_store.go +++ b/store/sqlstore/post_store.go @@ -1019,7 +1019,7 @@ func (s *SqlPostStore) Search(teamId string, userId string, params *model.Search queryParams["Terms"] = "(" + strings.Join(strings.Fields(terms), " & ") + ")" + excludeClause } - searchClause := fmt.Sprintf("AND to_tsvector('english', %s) @@ to_tsquery(:Terms)", searchType) + searchClause := fmt.Sprintf("AND to_tsvector('english', %s) @@ to_tsquery('english', :Terms)", searchType) searchQuery = strings.Replace(searchQuery, "SEARCH_CLAUSE", searchClause, 1) } else if s.DriverName() == model.DATABASE_DRIVER_MYSQL { searchClause := fmt.Sprintf("AND MATCH (%s) AGAINST (:Terms IN BOOLEAN MODE)", searchType)