From d86b8e1553f73b1bcecb4600c3cd187d1ba0b64b Mon Sep 17 00:00:00 2001 From: Wenxuan Zhao Date: Thu, 17 Oct 2019 23:58:36 -0700 Subject: [PATCH 1/2] Allow more than 255 characters for tokens in external_login_user table (#8554) Signed-off-by: Wenxuan Zhao --- models/external_login_user.go | 6 +++--- models/migrations/migrations.go | 2 ++ models/migrations/v101.go | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 models/migrations/v101.go diff --git a/models/external_login_user.go b/models/external_login_user.go index 59c37321844f5..726e09f27af68 100644 --- a/models/external_login_user.go +++ b/models/external_login_user.go @@ -28,9 +28,9 @@ type ExternalLoginUser struct { Description string AvatarURL string Location string - AccessToken string - AccessTokenSecret string - RefreshToken string + AccessToken string `xorm:"TEXT"` + AccessTokenSecret string `xorm:"TEXT"` + RefreshToken string `xorm:"TEXT"` ExpiresAt time.Time } diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 60a416c6e92ea..2518180e96aca 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -256,6 +256,8 @@ var migrations = []Migration{ NewMigration("add task table and status column for repository table", addTaskTable), // v100 -> v101 NewMigration("update migration repositories' service type", updateMigrationServiceTypes), + // v101 -> v102 + NewMigration("change length of some external login users columns", changeSomeColumnsLengthOfExternalLoginUser), } // Migrate database to current version diff --git a/models/migrations/v101.go b/models/migrations/v101.go new file mode 100644 index 0000000000000..9ef82a2933b19 --- /dev/null +++ b/models/migrations/v101.go @@ -0,0 +1,19 @@ +// Copyright 2019 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package migrations + +import ( + "xorm.io/xorm" +) + +func changeSomeColumnsLengthOfExternalLoginUser(x *xorm.Engine) error { + type ExternalLoginUser struct { + AccessToken string `xorm:"TEXT"` + AccessTokenSecret string `xorm:"TEXT"` + RefreshToken string `xorm:"TEXT"` + } + + return x.Sync2(new(ExternalLoginUser)) +} From 61031113190c5d9864aefcac4751c23a4352cc34 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 19 Oct 2019 05:25:37 +0200 Subject: [PATCH 2/2] use old xorm repo --- models/migrations/v101.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/migrations/v101.go b/models/migrations/v101.go index 9ef82a2933b19..dfe33f3d5b222 100644 --- a/models/migrations/v101.go +++ b/models/migrations/v101.go @@ -5,7 +5,7 @@ package migrations import ( - "xorm.io/xorm" + "github.com/go-xorm/xorm" ) func changeSomeColumnsLengthOfExternalLoginUser(x *xorm.Engine) error {