2 files changed, 35 insertions, 0 deletions
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 6c28989c2e..5a9c80a829 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -202,6 +202,8 @@ var migrations = []Migration{
 	NewMigration("add must_change_password column for users table", addMustChangePassword),
 	// v74 -> v75
 	NewMigration("add approval whitelists to protected branches", addApprovalWhitelistsToProtectedBranches),
+	// v75 -> v76
+	NewMigration("clear nonused data which not deleted when user was deleted", clearNonusedData),
 }
 
 // Migrate database to current version
diff --git a/models/migrations/v75.go b/models/migrations/v75.go
new file mode 100644
index 0000000000..d1ea5fcc94
--- /dev/null
+++ b/models/migrations/v75.go
@@ -0,0 +1,33 @@
+// Copyright 2018 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 (
+	"github.com/go-xorm/builder"
+	"github.com/go-xorm/xorm"
+)
+
+func clearNonusedData(x *xorm.Engine) error {
+	condDelete := func(colName string) builder.Cond {
+		return builder.NotIn(colName, builder.Select("id").From("user"))
+	}
+
+	if _, err := x.Exec(builder.Delete(condDelete("uid")).From("team_user")); err != nil {
+		return err
+	}
+
+	if _, err := x.Exec(builder.Delete(condDelete("user_id")).From("collaboration")); err != nil {
+		return err
+	}
+
+	if _, err := x.Exec(builder.Delete(condDelete("user_id")).From("stop_watch")); err != nil {
+		return err
+	}
+
+	if _, err := x.Exec(builder.Delete(condDelete("owner_id")).From("gpg_key")); err != nil {
+		return err
+	}
+	return nil
+}