Merge remote-tracking branch 'upstream/main' into limit-repo-size

models/migrations/fixtures/Test_DeleteOrphanedIssueLabels/label.yml

@@ -4,7 +4,6 @@
   org_id: 0
   name: label1
   color: '#abcdef'
-  exclusive: false
   num_issues: 2
   num_closed_issues: 0
 
@@ -14,7 +13,6 @@
   org_id: 0
   name: label2
   color: '#000000'
-  exclusive: false
   num_issues: 1
   num_closed_issues: 1
 -
@@ -23,7 +21,6 @@
   org_id:  3
   name: orglabel3
   color: '#abcdef'
-  exclusive: false
   num_issues: 0
   num_closed_issues: 0
 
@@ -33,7 +30,6 @@
   org_id: 3
   name: orglabel4
   color: '#000000'
-  exclusive: false
   num_issues: 1
   num_closed_issues: 0
 
@@ -43,6 +39,5 @@
   org_id: 0
   name: pull-test-label
   color: '#000000'
-  exclusive: false
   num_issues: 0
   num_closed_issues: 0

models/migrations/migrations.go

@@ -469,6 +469,12 @@ var migrations = []Migration{
 	NewMigration("Add NeedApproval to actions tables", v1_20.AddNeedApprovalToActionRun),
 	// v245 -> v246
 	NewMigration("Rename Webhook org_id to owner_id", v1_20.RenameWebhookOrgToOwner),
+	// v246 -> v247
+	NewMigration("Add missed column owner_id for project table", v1_20.AddNewColumnForProject),
+	// v247 -> v248
+	NewMigration("Fix incorrect project type", v1_20.FixIncorrectProjectType),
+	// v248 -> v249
+	NewMigration("Add version column to action_runner table", v1_20.AddVersionToActionRunner),
 	// to modify later
 	NewMigration("add size limit on repository", v1_20.AddSizeLimitOnRepo),
 }

models/migrations/v1_20/v246.go

@@ -0,0 +1,16 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_20 //nolint
+
+import (
+	"xorm.io/xorm"
+)
+
+func AddNewColumnForProject(x *xorm.Engine) error {
+	type Project struct {
+		OwnerID int64 `xorm:"INDEX"`
+	}
+
+	return x.Sync(new(Project))
+}

models/migrations/v1_20/v247.go

@@ -0,0 +1,50 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_20 //nolint
+
+import (
+	"code.gitea.io/gitea/modules/log"
+
+	"xorm.io/xorm"
+)
+
+// FixIncorrectProjectType: set individual project's type from 3(TypeOrganization) to 1(TypeIndividual)
+func FixIncorrectProjectType(x *xorm.Engine) error {
+	type User struct {
+		ID   int64 `xorm:"pk autoincr"`
+		Type int
+	}
+
+	const (
+		UserTypeIndividual int = 0
+
+		TypeIndividual   uint8 = 1
+		TypeOrganization uint8 = 3
+	)
+
+	type Project struct {
+		OwnerID int64 `xorm:"INDEX"`
+		Type    uint8
+		Owner   *User `xorm:"extends"`
+	}
+
+	sess := x.NewSession()
+	defer sess.Close()
+
+	if err := sess.Begin(); err != nil {
+		return err
+	}
+
+	count, err := sess.Table("project").
+		Where("type = ? AND owner_id IN (SELECT id FROM `user` WHERE type = ?)", TypeOrganization, UserTypeIndividual).
+		Update(&Project{
+			Type: TypeIndividual,
+		})
+	if err != nil {
+		return err
+	}
+	log.Debug("Updated %d projects to belong to a user instead of an organization", count)
+
+	return sess.Commit()
+}

models/migrations/v1_20/v248.go

@@ -0,0 +1,14 @@
+// Copyright 2023 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_20 //nolint
+
+import "xorm.io/xorm"
+
+func AddVersionToActionRunner(x *xorm.Engine) error {
+	type ActionRunner struct {
+		Version string `xorm:"VARCHAR(64)"` // the version of act_runner
+	}
+
+	return x.Sync(new(ActionRunner))
+}