diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-20 10:02:06 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-20 10:02:06 -0400 |
commit | 7d3bc099b969ebac7c3f9a9eaab67a4aa7f4707a (patch) | |
tree | 8d704cd24e9676c3b7a60258a52ed55c0fb9e7e1 | |
parent | e0d2ee3ccee80af95e1191f630802ff3fc1d55e5 (diff) | |
parent | 437efdaaaa102f53f4ed8630d5d85645cfd06999 (diff) | |
download | chat-7d3bc099b969ebac7c3f9a9eaab67a4aa7f4707a.tar.gz chat-7d3bc099b969ebac7c3f9a9eaab67a4aa7f4707a.tar.bz2 chat-7d3bc099b969ebac7c3f9a9eaab67a4aa7f4707a.zip |
Merge pull request #1119 from mattermost/fix-db-upgrade
Hotfix to allow db schema .7 to be upgraded to 1.1
-rw-r--r-- | store/sql_store.go | 16 | ||||
-rw-r--r-- | store/sql_team_store.go | 2 | ||||
-rw-r--r-- | store/sql_user_store.go | 2 |
3 files changed, 19 insertions, 1 deletions
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() { |