diff options
| author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-14 00:53:04 -0500 |
|---|---|---|
| committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-14 00:53:04 -0500 |
| commit | 88d693a950fad663016a84407c90b8de280c0252 (patch) | |
| tree | 571d01753c39f320b3634eae5723b76904d6bd48 /store/sqlstore/channel_member_history_store.go | |
| parent | 3fef21e350737c235e6dfc2d9f35311d65290c3e (diff) | |
| parent | 82209b9452f3241c879591bd29a163538cb70b5e (diff) | |
| download | chat-88d693a950fad663016a84407c90b8de280c0252.tar.gz chat-88d693a950fad663016a84407c90b8de280c0252.tar.bz2 chat-88d693a950fad663016a84407c90b8de280c0252.zip | |
Merge branch 'release-4.7' into icu753
Diffstat (limited to 'store/sqlstore/channel_member_history_store.go')
| -rw-r--r-- | store/sqlstore/channel_member_history_store.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/store/sqlstore/channel_member_history_store.go b/store/sqlstore/channel_member_history_store.go index 182f37ce9..9d077ab51 100644 --- a/store/sqlstore/channel_member_history_store.go +++ b/store/sqlstore/channel_member_history_store.go @@ -106,7 +106,7 @@ func (s SqlChannelMemberHistoryStore) hasDataAtOrBefore(time int64) (bool, error } } -func (s SqlChannelMemberHistoryStore) getFromChannelMemberHistoryTable(startTime int64, endTime int64, channelId string) ([]*model.ChannelMemberHistory, error) { +func (s SqlChannelMemberHistoryStore) getFromChannelMemberHistoryTable(startTime int64, endTime int64, channelId string) ([]*model.ChannelMemberHistoryResult, error) { query := ` SELECT cmh.*, @@ -119,7 +119,7 @@ func (s SqlChannelMemberHistoryStore) getFromChannelMemberHistoryTable(startTime ORDER BY cmh.JoinTime ASC` params := map[string]interface{}{"ChannelId": channelId, "StartTime": startTime, "EndTime": endTime} - var histories []*model.ChannelMemberHistory + var histories []*model.ChannelMemberHistoryResult if _, err := s.GetReplica().Select(&histories, query, params); err != nil { return nil, err } else { @@ -127,7 +127,7 @@ func (s SqlChannelMemberHistoryStore) getFromChannelMemberHistoryTable(startTime } } -func (s SqlChannelMemberHistoryStore) getFromChannelMembersTable(startTime int64, endTime int64, channelId string) ([]*model.ChannelMemberHistory, error) { +func (s SqlChannelMemberHistoryStore) getFromChannelMembersTable(startTime int64, endTime int64, channelId string) ([]*model.ChannelMemberHistoryResult, error) { query := ` SELECT DISTINCT ch.ChannelId, @@ -138,7 +138,7 @@ func (s SqlChannelMemberHistoryStore) getFromChannelMembersTable(startTime int64 WHERE ch.ChannelId = :ChannelId` params := map[string]interface{}{"ChannelId": channelId} - var histories []*model.ChannelMemberHistory + var histories []*model.ChannelMemberHistoryResult if _, err := s.GetReplica().Select(&histories, query, params); err != nil { return nil, err } else { |