diff options
| author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-09-10 16:13:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-10 16:13:21 +0200 |
| commit | 1f87596e7545cac041ed66e3640ec98bd09f129c (patch) | |
| tree | 834a3cfeeda909b11d066084d81ac280d5574a77 /store | |
| parent | 435ce3df4b1671643f5427b8983d6a0fe1e1dc03 (diff) | |
| parent | a8d116b381ec9c28c5da5c8ee39a3699f568130d (diff) | |
| download | chat-1f87596e7545cac041ed66e3640ec98bd09f129c.tar.gz chat-1f87596e7545cac041ed66e3640ec98bd09f129c.tar.bz2 chat-1f87596e7545cac041ed66e3640ec98bd09f129c.zip | |
Merge release-5.3
Diffstat (limited to 'store')
| -rw-r--r-- | store/sqlstore/post_store.go | 2 | ||||
| -rw-r--r-- | store/storetest/post_store.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/store/sqlstore/post_store.go b/store/sqlstore/post_store.go index 14a6039bc..9cf33888d 100644 --- a/store/sqlstore/post_store.go +++ b/store/sqlstore/post_store.go @@ -1156,7 +1156,7 @@ func (s *SqlPostStore) GetPostsByIds(postIds []string) store.StoreChannel { params[key] = postId } - query := `SELECT * FROM Posts WHERE Id in (` + keys.String() + `) and DeleteAt = 0 ORDER BY CreateAt DESC` + query := `SELECT * FROM Posts WHERE Id in (` + keys.String() + `) ORDER BY CreateAt DESC` var posts []*model.Post _, err := s.GetReplica().Select(&posts, query, params) diff --git a/store/storetest/post_store.go b/store/storetest/post_store.go index 5ab88847e..72819f49e 100644 --- a/store/storetest/post_store.go +++ b/store/storetest/post_store.go @@ -1674,8 +1674,8 @@ func testPostStoreGetPostsByIds(t *testing.T, ss store.Store) { store.Must(ss.Post().Delete(ro1.Id, model.GetMillis(), "")) - if ro5 := store.Must(ss.Post().GetPostsByIds(postIds)).([]*model.Post); len(ro5) != 2 { - t.Fatalf("Expected 2 posts in results. Got %v", len(ro5)) + if ro5 := store.Must(ss.Post().GetPostsByIds(postIds)).([]*model.Post); len(ro5) != 3 { + t.Fatalf("Expected 3 posts in results. Got %v", len(ro5)) } } |