Fix the v176 migration (#15110)

There is a serious issue with the v176 migration where there is a mistaken missing
label_id selection.

*introduced by #14912*

Signed-off-by: Andrew Thornton <art27@cantab.net>

diff --git a/models/consistency.go b/models/consistency.go
index 9d76d26bbb64b9409f398f98e7d23f3c4de54898..9f4cf759c718da21c4e4f667ff38198ba9b39d4f 100644 (file)
--- a/models/consistency.go
+++ b/models/consistency.go
@@ -380,7 +380,7 @@ func FixIssueLabelWithOutsideLabels() (int64, error) {
                SELECT il_too.id FROM (
                        SELECT il_too_too.id
                                FROM issue_label AS il_too_too
-                                       INNER JOIN label ON il_too_too.id = label.id
+                                       INNER JOIN label ON il_too_too.label_id = label.id
                                        INNER JOIN issue on issue.id = il_too_too.issue_id
                                        INNER JOIN repository on repository.id = issue.repo_id
                                WHERE

diff --git a/models/migrations/v176.go b/models/migrations/v176.go
index ff6587508d6eb31c4bda4c031ad40318744879e4..0365ae5673179fb7f69512984043b48d4463f822 100644 (file)
--- a/models/migrations/v176.go
+++ b/models/migrations/v176.go
@@ -48,7 +48,7 @@ func removeInvalidLabels(x *xorm.Engine) error {
                SELECT il_too.id FROM (
                        SELECT il_too_too.id
                                FROM issue_label AS il_too_too
-                                       INNER JOIN label ON il_too_too.id = label.id
+                                       INNER JOIN label ON il_too_too.label_id = label.id
                                        INNER JOIN issue on issue.id = il_too_too.issue_id
                                        INNER JOIN repository on repository.id = issue.repo_id
                                WHERE

diff --git a/models/repo_transfer.go b/models/repo_transfer.go
index c1326a1ac6a06eaf2504b4f2b59d58d37e55d425..60f3d15734a1fc3060113fd866a5db2428a3cb93 100644 (file)
--- a/models/repo_transfer.go
+++ b/models/repo_transfer.go
@@ -330,7 +330,7 @@ func TransferOwnership(doer *User, newOwnerName string, repo *Repository) (err e
                        SELECT il_too.id FROM (
                                SELECT il_too_too.id
                                        FROM issue_label AS il_too_too
-                                               INNER JOIN label ON il_too_too.id = label.id
+                                               INNER JOIN label ON il_too_too.label_id = label.id
                                                INNER JOIN issue on issue.id = il_too_too.issue_id
                                        WHERE
                                                issue.repo_id = ? AND (issue.repo_id != label.repo_id OR (label.repo_id = 0 AND label.org_id != ?))