diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-03-21 07:31:05 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-03-21 07:31:05 -0400 |
| commit | 85837efe06a93b38e449c750108a4105cc629611 (patch) | |
| tree | c20f4c8c076c395a22cc8a439b3a294401d5f09f /store/sql_post_store.go | |
| parent | 6f747b8b18d8a542ddbe353d6fa11a474bdbcae5 (diff) | |
| parent | 8326025d5bcb85e5dda40f375561c975e17ceba6 (diff) | |
| download | chat-85837efe06a93b38e449c750108a4105cc629611.tar.gz chat-85837efe06a93b38e449c750108a4105cc629611.tar.bz2 chat-85837efe06a93b38e449c750108a4105cc629611.zip | |
Merge pull request #2475 from mattermost/plt-1606
PLT-1606/PLT-714 Change searches to AND terms instead of OR
Diffstat (limited to 'store/sql_post_store.go')
| -rw-r--r-- | store/sql_post_store.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/store/sql_post_store.go b/store/sql_post_store.go index 3346534ab..68c22f7f6 100644 --- a/store/sql_post_store.go +++ b/store/sql_post_store.go @@ -726,13 +726,20 @@ func (s SqlPostStore) Search(teamId string, userId string, params *model.SearchP terms = wildcard.ReplaceAllLiteralString(terms, ":* ") } - terms = strings.Join(strings.Fields(terms), " | ") + terms = strings.Join(strings.Fields(terms), " & ") searchClause := fmt.Sprintf("AND %s @@ to_tsquery(:Terms)", searchType) searchQuery = strings.Replace(searchQuery, "SEARCH_CLAUSE", searchClause, 1) } else if utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_MYSQL { searchClause := fmt.Sprintf("AND MATCH (%s) AGAINST (:Terms IN BOOLEAN MODE)", searchType) searchQuery = strings.Replace(searchQuery, "SEARCH_CLAUSE", searchClause, 1) + + splitTerms := strings.Fields(terms) + for i, t := range strings.Fields(terms) { + splitTerms[i] = "+" + t + } + + terms = strings.Join(splitTerms, " ") } queryParams["Terms"] = terms |