summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerrick Anderson <derrick@andersonwebstudio.com>2018-03-05 14:50:10 -0500
committerGitHub <noreply@github.com>2018-03-05 14:50:10 -0500
commita3320e0ce31352e9279b87a9bed31b5bdfd8ad91 (patch)
tree2700aed0aa3db3ec3416c6ad94e03e3d765aaef0
parent2782602c6e9bed74443210d205d2ddf756aea44f (diff)
downloadchat-a3320e0ce31352e9279b87a9bed31b5bdfd8ad91.tar.gz
chat-a3320e0ce31352e9279b87a9bed31b5bdfd8ad91.tar.bz2
chat-a3320e0ce31352e9279b87a9bed31b5bdfd8ad91.zip
Uncomment upgrade code to 4.8 (#8409)
* upgrade to 48 * fix upgrade bug
-rw-r--r--model/version.go1
-rw-r--r--store/sqlstore/upgrade.go7
2 files changed, 4 insertions, 4 deletions
diff --git a/model/version.go b/model/version.go
index 6e461e5d5..3e75478d3 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{
+ "4.8.0",
"4.7.1",
"4.7.0",
"4.6.0",
diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go
index 77289183c..1e704ec01 100644
--- a/store/sqlstore/upgrade.go
+++ b/store/sqlstore/upgrade.go
@@ -365,8 +365,7 @@ func UpgradeDatabaseToVersion471(sqlStore SqlStore) {
}
func UpgradeDatabaseToVersion48(sqlStore SqlStore) {
- //TODO: Uncomment the following condition when version 4.8.0 is released
- //if shouldPerformUpgrade(sqlStore, VERSION_4_7_0, VERSION_4_8_0) {
- // saveSchemaVersion(sqlStore, VERSION_4_8_0)
- //}
+ if shouldPerformUpgrade(sqlStore, VERSION_4_7_1, VERSION_4_8_0) {
+ saveSchemaVersion(sqlStore, VERSION_4_8_0)
+ }
}