diff options
| author | Corey Hulen <corey@hulen.com> | 2015-08-02 08:59:27 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-08-02 08:59:27 -0800 |
| commit | 1ec597df598f168b00aefbaeb0f211dd579c0d45 (patch) | |
| tree | 5a10913067fea6ca13d20f0fd2fa88d848bbceff | |
| parent | 1f417368adf044baa9c6b6a24fe919bf5235346f (diff) | |
| parent | bcee238666397cf8c96ba6d1583470993e692012 (diff) | |
| download | chat-1ec597df598f168b00aefbaeb0f211dd579c0d45.tar.gz chat-1ec597df598f168b00aefbaeb0f211dd579c0d45.tar.bz2 chat-1ec597df598f168b00aefbaeb0f211dd579c0d45.zip | |
Merge pull request #291 from mattermost/mm-1758
MM-1758 partially fixed postgres search so that multiple search terms work
| -rw-r--r-- | store/sql_post_store.go | 2 | ||||
| -rw-r--r-- | store/sql_post_store_test.go | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/store/sql_post_store.go b/store/sql_post_store.go index ede69d125..479caf838 100644 --- a/store/sql_post_store.go +++ b/store/sql_post_store.go @@ -401,7 +401,7 @@ func (s SqlPostStore) Search(teamId string, userId string, terms string, isHasht Id = ChannelId AND TeamId = $1 AND UserId = $2 AND DeleteAt = 0) - AND %s @@ plainto_tsquery($3) + AND %s @@ to_tsquery($3) ORDER BY CreateAt DESC LIMIT 100`, searchType) diff --git a/store/sql_post_store_test.go b/store/sql_post_store_test.go index d1639aa03..336a20d98 100644 --- a/store/sql_post_store_test.go +++ b/store/sql_post_store_test.go @@ -483,4 +483,9 @@ func TestPostStoreSearch(t *testing.T) { if len(r8.Order) != 0 { t.Fatal("returned wrong serach result") } + + r9 := (<-store.Post().Search(teamId, userId, "mattermost jersey", false)).Data.(*model.PostList) + if len(r9.Order) != 2 { + t.Fatal("returned wrong search result") + } } |