Update schema for version 3.6 (#4972)

* Update schema for version 3.6

* Update version for version 3.6

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{
+	"3.6.0",
 	"3.5.0",
 	"3.4.0",
 	"3.3.0",

store/sql_upgrade.go

@@ -214,20 +214,18 @@ func UpgradeDatabaseToVersion35(sqlStore *SqlStore) {
 }
 
 func UpgradeDatabaseToVersion36(sqlStore *SqlStore) {
-	// TODO uncomment me before release
+	if shouldPerformUpgrade(sqlStore, VERSION_3_5_0, VERSION_3_6_0) {
-	//if shouldPerformUpgrade(sqlStore, VERSION_3_5_0, VERSION_3_6_0) {
+		sqlStore.CreateColumnIfNotExists("Posts", "HasReactions", "tinyint", "boolean", "0")
 
-	sqlStore.CreateColumnIfNotExists("Posts", "HasReactions", "tinyint", "boolean", "0")
+		// Create Team Description column
+		sqlStore.CreateColumnIfNotExists("Teams", "Description", "varchar(255)", "varchar(255)", "")
 
-	// Create Team Description column
+		// Add a Position column to users.
-	sqlStore.CreateColumnIfNotExists("Teams", "Description", "varchar(255)", "varchar(255)", "")
+		sqlStore.CreateColumnIfNotExists("Users", "Position", "varchar(64)", "varchar(64)", "")
 
-	// Add a Position column to users.
+		// Remove ActiveChannel column from Status
-	sqlStore.CreateColumnIfNotExists("Users", "Position", "varchar(64)", "varchar(64)", "")
+		sqlStore.RemoveColumnIfExists("Status", "ActiveChannel")
 
-	// Remove ActiveChannel column from Status
+		saveSchemaVersion(sqlStore, VERSION_3_6_0)
-	sqlStore.RemoveColumnIfExists("Status", "ActiveChannel")
+	}
-
-	//saveSchemaVersion(sqlStore, VERSION_3_6_0)
-	//}
 }