From ff127bbaa343026a55429acf37f2c95186d07ac5 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Wed, 4 Jan 2017 17:24:07 -0500
Subject: Update schema for version 3.6 (#4972)

* Update schema for version 3.6

* Update version for version 3.6
---
 model/version.go     |  1 +
 store/sql_upgrade.go | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/model/version.go b/model/version.go
index 9d9d8fc1e..2a034dec5 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{
+	"3.6.0",
 	"3.5.0",
 	"3.4.0",
 	"3.3.0",
diff --git a/store/sql_upgrade.go b/store/sql_upgrade.go
index 4c4d83504..d69404baa 100644
--- a/store/sql_upgrade.go
+++ b/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
-	sqlStore.CreateColumnIfNotExists("Teams", "Description", "varchar(255)", "varchar(255)", "")
+		// Add a Position column to users.
+		sqlStore.CreateColumnIfNotExists("Users", "Position", "varchar(64)", "varchar(64)", "")
 
-	// Add a Position column to users.
-	sqlStore.CreateColumnIfNotExists("Users", "Position", "varchar(64)", "varchar(64)", "")
+		// Remove ActiveChannel column from Status
+		sqlStore.RemoveColumnIfExists("Status", "ActiveChannel")
 
-	// Remove ActiveChannel column from Status
-	sqlStore.RemoveColumnIfExists("Status", "ActiveChannel")
-
-	//saveSchemaVersion(sqlStore, VERSION_3_6_0)
-	//}
+		saveSchemaVersion(sqlStore, VERSION_3_6_0)
+	}
 }
-- 
cgit v1.2.3-1-g7c22