diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-09-21 07:16:40 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-09-21 07:16:40 -0400 |
| commit | 1c1f06def947407ccb030dc5ac2efcfee5ee2db4 (patch) | |
| tree | 4428301af7b450da29e4ea674c24f23175ed58ec /store/sql_upgrade.go | |
| parent | 33e20b874e9709fc8d9e45ffb8d0c2357bc79e8d (diff) | |
| download | chat-1c1f06def947407ccb030dc5ac2efcfee5ee2db4.tar.gz chat-1c1f06def947407ccb030dc5ac2efcfee5ee2db4.tar.bz2 chat-1c1f06def947407ccb030dc5ac2efcfee5ee2db4.zip | |
Moved ThemeProps migration to correctly take place in 3.2 -> 3.3 migration (#4054)
Diffstat (limited to 'store/sql_upgrade.go')
| -rw-r--r-- | store/sql_upgrade.go | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/store/sql_upgrade.go b/store/sql_upgrade.go index 445f3f349..c456d839b 100644 --- a/store/sql_upgrade.go +++ b/store/sql_upgrade.go @@ -67,13 +67,13 @@ func saveSchemaVersion(sqlStore *SqlStore, version string) { } sqlStore.SchemaVersion = version - l4g.Info(utils.T("store.sql.upgraded.warn"), version) + l4g.Warn(utils.T("store.sql.upgraded.warn"), version) } func shouldPerformUpgrade(sqlStore *SqlStore, currentSchemaVersion string, expectedSchemaVersion string) bool { if sqlStore.SchemaVersion == currentSchemaVersion { - l4g.Info(utils.T("store.sql.schema_out_of_date.warn"), currentSchemaVersion) - l4g.Info(utils.T("store.sql.schema_upgrade_attempt.warn"), expectedSchemaVersion) + l4g.Warn(utils.T("store.sql.schema_out_of_date.warn"), currentSchemaVersion) + l4g.Warn(utils.T("store.sql.schema_upgrade_attempt.warn"), expectedSchemaVersion) return true } @@ -92,6 +92,18 @@ func UpgradeDatabaseToVersion32(sqlStore *SqlStore) { if shouldPerformUpgrade(sqlStore, VERSION_3_1_0, VERSION_3_2_0) { sqlStore.CreateColumnIfNotExists("TeamMembers", "DeleteAt", "bigint(20)", "bigint", "0") + saveSchemaVersion(sqlStore, VERSION_3_2_0) + } +} + +func themeMigrationFailed(err error) { + l4g.Critical(utils.T("store.sql_user.migrate_theme.critical"), err) + time.Sleep(time.Second) + os.Exit(EXIT_THEME_MIGRATION) +} + +func UpgradeDatabaseToVersion33(sqlStore *SqlStore) { + if shouldPerformUpgrade(sqlStore, VERSION_3_2_0, VERSION_3_3_0) { if sqlStore.DoesColumnExist("Users", "ThemeProps") { params := map[string]interface{}{ "Category": model.PREFERENCE_CATEGORY_THEME, @@ -147,19 +159,6 @@ func UpgradeDatabaseToVersion32(sqlStore *SqlStore) { } } - saveSchemaVersion(sqlStore, VERSION_3_2_0) - } -} - -func themeMigrationFailed(err error) { - l4g.Critical(utils.T("store.sql_user.migrate_theme.critical"), err) - time.Sleep(time.Second) - os.Exit(EXIT_THEME_MIGRATION) -} - -func UpgradeDatabaseToVersion33(sqlStore *SqlStore) { - if shouldPerformUpgrade(sqlStore, VERSION_3_2_0, VERSION_3_3_0) { - sqlStore.CreateColumnIfNotExists("OAuthApps", "IsTrusted", "tinyint(1)", "boolean", "0") sqlStore.CreateColumnIfNotExists("OAuthApps", "IconURL", "varchar(512)", "varchar(512)", "") sqlStore.CreateColumnIfNotExists("OAuthAccessData", "ClientId", "varchar(26)", "varchar(26)", "") |