Add primary key and index to external login user table (#1656)

release/v1.15
Lauris BH 2017-05-02 11:41:44 +03:00 committed by Bo-Yi Wu
parent 87efc8c6d4
commit 98548c83d3
3 changed files with 43 additions and 3 deletions

View File

@ -8,9 +8,9 @@ import "github.com/markbates/goth"
// ExternalLoginUser makes the connecting between some existing user and additional external login sources
type ExternalLoginUser struct {
ExternalID string `xorm:"NOT NULL"`
UserID int64 `xorm:"NOT NULL"`
LoginSourceID int64 `xorm:"NOT NULL"`
ExternalID string `xorm:"pk NOT NULL"`
UserID int64 `xorm:"INDEX NOT NULL"`
LoginSourceID int64 `xorm:"pk NOT NULL"`
}
// GetExternalLogin checks if a externalID in loginSourceID scope already exists

View File

@ -108,6 +108,8 @@ var migrations = []Migration{
NewMigration("add field for repo size", addRepoSize),
// v29 -> v30
NewMigration("add commit status table", addCommitStatus),
// v30 -> 31
NewMigration("add primary key to external login user", addExternalLoginUserPK),
}
// Migrate database to current version

38
models/migrations/v30.go Normal file
View File

@ -0,0 +1,38 @@
// Copyright 2017 The Gogs 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 (
"fmt"
"github.com/go-xorm/xorm"
)
func addExternalLoginUserPK(x *xorm.Engine) error {
// ExternalLoginUser see models/external_login_user.go
type ExternalLoginUser struct {
ExternalID string `xorm:"pk NOT NULL"`
UserID int64 `xorm:"INDEX NOT NULL"`
LoginSourceID int64 `xorm:"pk NOT NULL"`
}
extlogins := make([]*ExternalLoginUser, 0, 6)
if err := x.Find(&extlogins); err != nil {
return fmt.Errorf("Find: %v", err)
}
if err := x.DropTables(new(ExternalLoginUser)); err != nil {
return fmt.Errorf("DropTables: %v", err)
}
if err := x.Sync2(new(ExternalLoginUser)); err != nil {
return fmt.Errorf("Sync2: %v", err)
}
if _, err := x.Insert(extlogins); err != nil {
return fmt.Errorf("Insert: %v", err)
}
return nil
}