diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-02-14 08:53:25 -0500 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-02-14 08:53:25 -0500 |
| commit | 642d78173af8cf600cdf81a341d87e75e7854172 (patch) | |
| tree | f02ffb39d35c76319607b1b96e896a3db35ee746 /store/sqlstore/upgrade.go | |
| parent | bfb2e85bf6d31a0b2b35a9b4369a94c479b371d9 (diff) | |
| parent | bf1fdf92c71df29ddb7b0e31a00e218863c1158c (diff) | |
| download | chat-642d78173af8cf600cdf81a341d87e75e7854172.tar.gz chat-642d78173af8cf600cdf81a341d87e75e7854172.tar.bz2 chat-642d78173af8cf600cdf81a341d87e75e7854172.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1
Diffstat (limited to 'store/sqlstore/upgrade.go')
| -rw-r--r-- | store/sqlstore/upgrade.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 265696288..8d1513381 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -346,6 +346,8 @@ func UpgradeDatabaseToVersion47(sqlStore SqlStore) { if shouldPerformUpgrade(sqlStore, VERSION_4_6_0, VERSION_4_7_0) { sqlStore.AlterColumnTypeIfExists("Users", "Position", "varchar(128)", "varchar(128)") sqlStore.AlterColumnTypeIfExists("OAuthAuthData", "State", "varchar(1024)", "varchar(1024)") + sqlStore.RemoveColumnIfExists("ChannelMemberHistory", "Email") + sqlStore.RemoveColumnIfExists("ChannelMemberHistory", "Username") saveSchemaVersion(sqlStore, VERSION_4_7_0) } } |