summaryrefslogtreecommitdiffstats
path: root/store/sql_session_store.go
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-02-22 16:08:40 -0800
committer=Corey Hulen <corey@hulen.com>2016-02-22 16:08:40 -0800
commit1bb85818ca5d7569c17e56d523d9668b83973e65 (patch)
tree5b40290c7a65678171cfc236ffc1cd72e88027cf /store/sql_session_store.go
parent32ae72d91d31699899d5e2084cf7faa40c81e42c (diff)
downloadchat-1bb85818ca5d7569c17e56d523d9668b83973e65.tar.gz
chat-1bb85818ca5d7569c17e56d523d9668b83973e65.tar.bz2
chat-1bb85818ca5d7569c17e56d523d9668b83973e65.zip
Fixing device id column for droid
Diffstat (limited to 'store/sql_session_store.go')
-rw-r--r--store/sql_session_store.go9
1 files changed, 7 insertions, 2 deletions
diff --git a/store/sql_session_store.go b/store/sql_session_store.go
index 6532947f4..8dccc0770 100644
--- a/store/sql_session_store.go
+++ b/store/sql_session_store.go
@@ -22,7 +22,7 @@ func NewSqlSessionStore(sqlStore *SqlStore) SessionStore {
table.ColMap("Token").SetMaxSize(26)
table.ColMap("UserId").SetMaxSize(26)
table.ColMap("TeamId").SetMaxSize(26)
- table.ColMap("DeviceId").SetMaxSize(128)
+ table.ColMap("DeviceId").SetMaxSize(512)
table.ColMap("Roles").SetMaxSize(64)
table.ColMap("Props").SetMaxSize(1000)
}
@@ -31,6 +31,11 @@ func NewSqlSessionStore(sqlStore *SqlStore) SessionStore {
}
func (me SqlSessionStore) UpgradeSchemaIfNeeded() {
+ // ADDED for 2.1 REMOVE for 2.5
+ deviceIdLength := me.GetMaxLengthOfColumnIfExists("Sessions", "DeviceId")
+ if len(deviceIdLength) > 0 && deviceIdLength != "512" {
+ me.AlterColumnTypeIfExists("Sessions", "DeviceId", "VARCHAR(512)", "VARCHAR(512)")
+ }
}
func (me SqlSessionStore) CreateIndexesIfNotExists() {
@@ -239,7 +244,7 @@ func (me SqlSessionStore) UpdateDeviceId(id, deviceId string) StoreChannel {
go func() {
result := StoreResult{}
if _, err := me.GetMaster().Exec("UPDATE Sessions SET DeviceId = :DeviceId WHERE Id = :Id", map[string]interface{}{"DeviceId": deviceId, "Id": id}); err != nil {
- result.Err = model.NewLocAppError("SqlSessionStore.UpdateDeviceId", "store.sql_session.update_device_id.app_error", nil, "")
+ result.Err = model.NewLocAppError("SqlSessionStore.UpdateDeviceId", "store.sql_session.update_device_id.app_error", nil, err.Error())
} else {
result.Data = deviceId
}