diff options
| author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-14 00:51:40 -0500 |
|---|---|---|
| committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-14 00:51:40 -0500 |
| commit | 82209b9452f3241c879591bd29a163538cb70b5e (patch) | |
| tree | 96e8f431e2c9c2355c90237b9f7f3b3ebd4dd5c0 /store/sqlstore/channel_member_history_store.go | |
| parent | 2fa49a41f7d1dfb8cb7a45ff1a48fdd350e9e158 (diff) | |
| parent | 8c22c5c6c6f835a6e73faf19036bad2a51bb9127 (diff) | |
| download | chat-82209b9452f3241c879591bd29a163538cb70b5e.tar.gz chat-82209b9452f3241c879591bd29a163538cb70b5e.tar.bz2 chat-82209b9452f3241c879591bd29a163538cb70b5e.zip | |
Merge branch 'XYZ-110' into release-4.7
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 { |