From 56e629e84246b0837088ea66fadc134c074ee57a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sven=20H=C3=BCster?= Date: Wed, 26 Jun 2019 14:12:47 +0200 Subject: [PATCH] postgres use specific full text idx (#11022) --- 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 244d35025d..dd2c488f88 100644 --- a/store/sqlstore/channel_store.go +++ b/store/sqlstore/channel_store.go @@ -2218,7 +2218,7 @@ func (s SqlChannelStore) buildFulltextClause(term string, searchColumns string) fulltextTerm = strings.Join(splitTerm, " ") - fulltextClause = fmt.Sprintf("((%s) @@ to_tsquery(:FulltextTerm))", convertMySQLFullTextColumnsToPostgres(searchColumns)) + fulltextClause = fmt.Sprintf("((to_tsvector('english', %s)) @@ to_tsquery(: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 82e12061f3..d0e300e4d5 100644 --- a/store/sqlstore/post_store.go +++ b/store/sqlstore/post_store.go @@ -893,7 +893,7 @@ func (s *SqlPostStore) Search(teamId string, userId string, params *model.Search terms = strings.Join(strings.Fields(terms), " & ") } - searchClause := fmt.Sprintf("AND %s @@ to_tsquery(:Terms)", searchType) + searchClause := fmt.Sprintf("AND to_tsvector('english', %s) @@ to_tsquery(: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)