summaryrefslogtreecommitdiffstats
path: root/store/sqlstore/upgrade.go
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2018-02-06 17:25:53 +0000
committerGeorge Goldberg <george@gberg.me>2018-02-06 17:25:53 +0000
commit7941c30117efe1b957ac0458c2f0479e3824196d (patch)
treedf791632a9dc790a6f73dec53aae3ba919ebda63 /store/sqlstore/upgrade.go
parente1cd64613591cf5a990442a69ebf188258bd0cb5 (diff)
parent034dbc07e3068c482e654b6a1a8fcbe4b01c44f3 (diff)
downloadchat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.gz
chat-7941c30117efe1b957ac0458c2f0479e3824196d.tar.bz2
chat-7941c30117efe1b957ac0458c2f0479e3824196d.zip
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'store/sqlstore/upgrade.go')
-rw-r--r--store/sqlstore/upgrade.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go
index 7f38e3a73..0de91f28b 100644
--- a/store/sqlstore/upgrade.go
+++ b/store/sqlstore/upgrade.go
@@ -341,8 +341,8 @@ func UpgradeDatabaseToVersion46(sqlStore SqlStore) {
}
func UpgradeDatabaseToVersion47(sqlStore SqlStore) {
- // if shouldPerformUpgrade(sqlStore, VERSION_4_6_0, VERSION_4_7_0) {
- sqlStore.AlterColumnTypeIfExists("Users", "Position", "varchar(128)", "varchar(128)")
- // saveSchemaVersion(sqlStore, VERSION_4_7_0)
- // }
+ if shouldPerformUpgrade(sqlStore, VERSION_4_6_0, VERSION_4_7_0) {
+ sqlStore.AlterColumnTypeIfExists("Users", "Position", "varchar(128)", "varchar(128)")
+ saveSchemaVersion(sqlStore, VERSION_4_7_0)
+ }
}