Uncomment upgrade for 4.6 (#8045)

* Uncomment upgrade for 4.6

* add 4.6 version

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.6.0",
 	"4.5.0",
 	"4.4.0",
 	"4.3.0",

store/sqlstore/upgrade.go

@@ -325,18 +325,12 @@ func UpgradeDatabaseToVersion44(sqlStore SqlStore) {
 }
 
 func UpgradeDatabaseToVersion46(sqlStore SqlStore) {
-	//TODO: Uncomment folowing when version 4.6 is released
-	//if shouldPerformUpgrade(sqlStore, VERSION_4_5_0, VERSION_4_6_0) {
 
-	//TODO: Remove these remove calls when version 4.6 is released. The columns were renamed.
-	sqlStore.RemoveColumnIfExists("IncomingWebhooks", "PostUsername")
-	sqlStore.RemoveColumnIfExists("IncomingWebhooks", "PostIconURL")
-
-	sqlStore.CreateColumnIfNotExists("IncomingWebhooks", "Username", "varchar(64)", "varchar(64)", "")
-	sqlStore.CreateColumnIfNotExists("IncomingWebhooks", "IconURL", "varchar(1024)", "varchar(1024)", "")
-
-	//saveSchemaVersion(sqlStore, VERSION_4_6_0)
-	//}
+	if shouldPerformUpgrade(sqlStore, VERSION_4_5_0, VERSION_4_6_0) {
+		sqlStore.CreateColumnIfNotExists("IncomingWebhooks", "Username", "varchar(64)", "varchar(64)", "")
+		sqlStore.CreateColumnIfNotExists("IncomingWebhooks", "IconURL", "varchar(1024)", "varchar(1024)", "")
+		saveSchemaVersion(sqlStore, VERSION_4_6_0)
+	}
 }
 
 func UpgradeDatabaseToVersion45(sqlStore SqlStore) {