From b7a4b1a418c7cf149c37525feebd410b1b0704c5 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Thu, 8 Oct 2015 10:59:38 -0700
Subject: Fixing db upgrade for 1.1

---
 store/sql_channel_store.go | 3 +++
 store/sql_store.go         | 7 -------
 store/sql_team_store.go    | 1 -
 store/sql_user_store.go    | 1 -
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go
index a54e6ba54..56e190fee 100644
--- a/store/sql_channel_store.go
+++ b/store/sql_channel_store.go
@@ -38,6 +38,8 @@ func NewSqlChannelStore(sqlStore *SqlStore) ChannelStore {
 }
 
 func (s SqlChannelStore) UpgradeSchemaIfNeeded() {
+
+	// BEGIN REMOVE AFTER 1.1.0
 	if s.CreateColumnIfNotExists("ChannelMembers", "NotifyProps", "varchar(2000)", "varchar(2000)", "{}") {
 		// populate NotifyProps from existing NotifyLevel field
 
@@ -80,6 +82,7 @@ func (s SqlChannelStore) UpgradeSchemaIfNeeded() {
 
 		s.RemoveColumnIfExists("ChannelMembers", "NotifyLevel")
 	}
+	// END REMOVE AFTER 1.1.0
 }
 
 func (s SqlChannelStore) CreateIndexesIfNotExists() {
diff --git a/store/sql_store.go b/store/sql_store.go
index 9ec899f7c..900543460 100644
--- a/store/sql_store.go
+++ b/store/sql_store.go
@@ -84,13 +84,6 @@ func NewSqlStore() Store {
 		}
 	}
 
-	// Temporary upgrade code, remove after 0.8.0 release
-	if sqlStore.DoesTableExist("Sessions") {
-		if sqlStore.DoesColumnExist("Sessions", "AltId") {
-			sqlStore.GetMaster().Exec("DROP TABLE IF EXISTS Sessions")
-		}
-	}
-
 	sqlStore.team = NewSqlTeamStore(sqlStore)
 	sqlStore.channel = NewSqlChannelStore(sqlStore)
 	sqlStore.post = NewSqlPostStore(sqlStore)
diff --git a/store/sql_team_store.go b/store/sql_team_store.go
index ff1d4ac35..de44782cf 100644
--- a/store/sql_team_store.go
+++ b/store/sql_team_store.go
@@ -28,7 +28,6 @@ func NewSqlTeamStore(sqlStore *SqlStore) TeamStore {
 }
 
 func (s SqlTeamStore) UpgradeSchemaIfNeeded() {
-	s.RemoveColumnIfExists("Teams", "AllowValet")
 }
 
 func (s SqlTeamStore) CreateIndexesIfNotExists() {
diff --git a/store/sql_user_store.go b/store/sql_user_store.go
index f36226cf8..011acd7e4 100644
--- a/store/sql_user_store.go
+++ b/store/sql_user_store.go
@@ -41,7 +41,6 @@ func NewSqlUserStore(sqlStore *SqlStore) UserStore {
 }
 
 func (us SqlUserStore) UpgradeSchemaIfNeeded() {
-	us.CreateColumnIfNotExists("Users", "ThemeProps", "varchar(2000)", "character varying(2000)", "{}")
 }
 
 func (us SqlUserStore) CreateIndexesIfNotExists() {
-- 
cgit v1.2.3-1-g7c22