Add upgrade code from 4.7.0 to 4.7.1

1 files changed, 12 insertions, 0 deletions

diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go
index 75286d214..25c9e067a 100644
--- a/store/sqlstore/upgrade.go
+++ b/store/sqlstore/upgrade.go
@@ -15,6 +15,7 @@ import (
 )
 
 const (
+	VERSION_4_7_1            = "4.7.1"
 	VERSION_4_7_0            = "4.7.0"
 	VERSION_4_6_0            = "4.6.0"
 	VERSION_4_5_0            = "4.5.0"
@@ -64,6 +65,7 @@ func UpgradeDatabase(sqlStore SqlStore) {
 	UpgradeDatabaseToVersion45(sqlStore)
 	UpgradeDatabaseToVersion46(sqlStore)
 	UpgradeDatabaseToVersion47(sqlStore)
+	UpgradeDatabaseToVersion471(sqlStore)
 
 	// If the SchemaVersion is empty this this is the first time it has ran
 	// so lets set it to the current version.
@@ -349,3 +351,13 @@ func UpgradeDatabaseToVersion47(sqlStore SqlStore) {
 		saveSchemaVersion(sqlStore, VERSION_4_7_0)
 	}
 }
+
+// If any new instances started with 4.7, they would have the bad Email column on the
+// ChannelMemberHistory table. So for those cases we need to do an upgrade between
+// 4.7.0 and 4.7.1
+func UpgradeDatabaseToVersion471(sqlStore SqlStore) {
+	if shouldPerformUpgrade(sqlStore, VERSION_4_7_0, VERSION_4_7_1) {
+		sqlStore.RemoveColumnIfExists("ChannelMemberHistory", "Email")
+		saveSchemaVersion(sqlStore, VERSION_4_7_1)
+	}
+}