From 98548c83d369a15f10dcd01656474c8dad98ba6a Mon Sep 17 00:00:00 2001
From: Lauris BH <lauris@nix.lv>
Date: Tue, 2 May 2017 11:41:44 +0300
Subject: [PATCH] Add primary key and index to external login user table
 (#1656)

---
 models/external_login_user.go   |  6 +++---
 models/migrations/migrations.go |  2 ++
 models/migrations/v30.go        | 38 +++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 models/migrations/v30.go

diff --git a/models/external_login_user.go b/models/external_login_user.go
index b2680943c4..21a3cbbd31 100644
--- a/models/external_login_user.go
+++ b/models/external_login_user.go
@@ -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
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 92dd4c8ccd..4877a9fb02 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -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
diff --git a/models/migrations/v30.go b/models/migrations/v30.go
new file mode 100644
index 0000000000..90047df8b6
--- /dev/null
+++ b/models/migrations/v30.go
@@ -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
+}