Merge branch 'pr-5277' into develop

# Conflicts:
#	models/migrations/migrations.go

2 files changed, 20 insertions, 0 deletions

diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 7e700f49..44496a15 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -66,6 +66,8 @@ var migrations = []Migration{
 	NewMigration("remove invalid protect branch whitelist", removeInvalidProtectBranchWhitelist),
 	// v17 -> v18:v0.11.48
 	NewMigration("store long text in repository description field", updateRepositoryDescriptionField),
+	// v18 -> v19:v0.11.55
+	NewMigration("clean unlinked webhook and hook_tasks", cleanUnlinkedWebhookAndHookTasks),
 }
 
 // Migrate database to current version
diff --git a/models/migrations/v19.go b/models/migrations/v19.go
new file mode 100644
index 00000000..839e181f
--- /dev/null
+++ b/models/migrations/v19.go
@@ -0,0 +1,18 @@
+// Copyright 2018 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 (
+	"github.com/go-xorm/xorm"
+)
+
+func cleanUnlinkedWebhookAndHookTasks(x *xorm.Engine) error {
+	_, err := x.Exec(`DELETE FROM webhook WHERE repo_id NOT IN (SELECT id FROM repository);`)
+	if err != nil {
+		return err
+	}
+	_, err = x.Exec(`DELETE FROM hook_task WHERE repo_id NOT IN (SELECT id FROM repository);`)
+	return err
+}