From 7b2861de3a09cf00d00b0872cc537d54302c4bfa Mon Sep 17 00:00:00 2001 From: Jonathan Fritz Date: Mon, 12 Feb 2018 16:14:52 -0500 Subject: Removed unused fields from ChannelMemberHistory table, introduced new model.ChannelMemberHistoryResult object that includes those fields that are selected from a join on other tables --- model/ChannelMemberHistoryResult.go | 15 +++++++++++++++ model/channel_member_history.go | 4 ---- 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 model/ChannelMemberHistoryResult.go (limited to 'model') diff --git a/model/ChannelMemberHistoryResult.go b/model/ChannelMemberHistoryResult.go new file mode 100644 index 000000000..ed3e79639 --- /dev/null +++ b/model/ChannelMemberHistoryResult.go @@ -0,0 +1,15 @@ +// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +package model + +type ChannelMemberHistoryResult struct { + ChannelId string + UserId string + JoinTime int64 + LeaveTime *int64 + + // these two fields are never set in the database - when we SELECT, we join on Users to get them + UserEmail string `db:"Email"` + Username string +} diff --git a/model/channel_member_history.go b/model/channel_member_history.go index 47c59d54e..55435c320 100644 --- a/model/channel_member_history.go +++ b/model/channel_member_history.go @@ -8,8 +8,4 @@ type ChannelMemberHistory struct { UserId string JoinTime int64 LeaveTime *int64 - - // these two fields are never set in the database - when we SELECT, we join on Users to get them - UserEmail string `db:"Email"` - Username string } -- cgit v1.2.3-1-g7c22 From 8c22c5c6c6f835a6e73faf19036bad2a51bb9127 Mon Sep 17 00:00:00 2001 From: Jonathan Fritz Date: Tue, 13 Feb 2018 10:48:34 -0500 Subject: Renamed file to match existing scheme --- model/ChannelMemberHistoryResult.go | 15 --------------- model/channel_member_history_result.go | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 model/ChannelMemberHistoryResult.go create mode 100644 model/channel_member_history_result.go (limited to 'model') diff --git a/model/ChannelMemberHistoryResult.go b/model/ChannelMemberHistoryResult.go deleted file mode 100644 index ed3e79639..000000000 --- a/model/ChannelMemberHistoryResult.go +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. - -package model - -type ChannelMemberHistoryResult struct { - ChannelId string - UserId string - JoinTime int64 - LeaveTime *int64 - - // these two fields are never set in the database - when we SELECT, we join on Users to get them - UserEmail string `db:"Email"` - Username string -} diff --git a/model/channel_member_history_result.go b/model/channel_member_history_result.go new file mode 100644 index 000000000..ed3e79639 --- /dev/null +++ b/model/channel_member_history_result.go @@ -0,0 +1,15 @@ +// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved. +// See License.txt for license information. + +package model + +type ChannelMemberHistoryResult struct { + ChannelId string + UserId string + JoinTime int64 + LeaveTime *int64 + + // these two fields are never set in the database - when we SELECT, we join on Users to get them + UserEmail string `db:"Email"` + Username string +} -- cgit v1.2.3-1-g7c22 From 98bd9a07538891d3ee9aded8865b4454cf72ea32 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Fri, 16 Feb 2018 17:03:12 -0500 Subject: Remove bad field from ChannelMemberHistory model --- model/channel_member_history.go | 1 - 1 file changed, 1 deletion(-) (limited to 'model') diff --git a/model/channel_member_history.go b/model/channel_member_history.go index bc71b580a..55435c320 100644 --- a/model/channel_member_history.go +++ b/model/channel_member_history.go @@ -6,7 +6,6 @@ package model type ChannelMemberHistory struct { ChannelId string UserId string - UserEmail string `db:"Email"` JoinTime int64 LeaveTime *int64 } -- cgit v1.2.3-1-g7c22 From 291432e2549d7f36c3c39336d925b036c0ef5de4 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Fri, 16 Feb 2018 17:14:22 -0500 Subject: Add upgrade code from 4.7.0 to 4.7.1 --- model/version.go | 1 + 1 file changed, 1 insertion(+) (limited to 'model') diff --git a/model/version.go b/model/version.go index 1bd7baecc..6e461e5d5 100644 --- a/model/version.go +++ b/model/version.go @@ -13,6 +13,7 @@ import ( // It should be maitained in chronological order with most current // release at the front of the list. var versions = []string{ + "4.7.1", "4.7.0", "4.6.0", "4.5.0", -- cgit v1.2.3-1-g7c22