From 437efdaaaa102f53f4ed8630d5d85645cfd06999 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 20 Oct 2015 04:49:42 -0700
Subject: Hotfix to allow .7 to be upgraded to 1.1

---
 store/sql_store.go      | 16 +++++++++++++++-
 store/sql_team_store.go |  2 ++
 store/sql_user_store.go |  2 ++
 3 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'store')

diff --git a/store/sql_store.go b/store/sql_store.go
index 900543460..3d10772d9 100644
--- a/store/sql_store.go
+++ b/store/sql_store.go
@@ -72,7 +72,14 @@ func NewSqlStore() Store {
 		// Check to see if it's the most current database schema version
 		if !model.IsCurrentVersion(schemaVersion) {
 			// If we are upgrading from the previous version then print a warning and continue
-			if model.IsPreviousVersion(schemaVersion) {
+
+			// Special case
+			isSchemaVersion07 := false
+			if schemaVersion == "0.7.1" || schemaVersion == "0.7.0" {
+				isSchemaVersion07 = true
+			}
+
+			if model.IsPreviousVersion(schemaVersion) || isSchemaVersion07 {
 				l4g.Warn("The database schema version of " + schemaVersion + " appears to be out of date")
 				l4g.Warn("Attempting to upgrade the database schema version to " + model.CurrentVersion)
 			} else {
@@ -84,6 +91,13 @@ func NewSqlStore() Store {
 		}
 	}
 
+	// REMOVE in 1.2
+	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 de44782cf..2d65435b0 100644
--- a/store/sql_team_store.go
+++ b/store/sql_team_store.go
@@ -28,6 +28,8 @@ func NewSqlTeamStore(sqlStore *SqlStore) TeamStore {
 }
 
 func (s SqlTeamStore) UpgradeSchemaIfNeeded() {
+	// REMOVE in 1.2
+	s.RemoveColumnIfExists("Teams", "AllowValet")
 }
 
 func (s SqlTeamStore) CreateIndexesIfNotExists() {
diff --git a/store/sql_user_store.go b/store/sql_user_store.go
index dc6b07a16..a2b317afa 100644
--- a/store/sql_user_store.go
+++ b/store/sql_user_store.go
@@ -41,6 +41,8 @@ func NewSqlUserStore(sqlStore *SqlStore) UserStore {
 }
 
 func (us SqlUserStore) UpgradeSchemaIfNeeded() {
+	// REMOVE in 1.2
+	us.CreateColumnIfNotExists("Users", "ThemeProps", "varchar(2000)", "character varying(2000)", "{}")
 }
 
 func (us SqlUserStore) CreateIndexesIfNotExists() {
-- 
cgit v1.2.3-1-g7c22