diff --git a/modelmigration/base/db.go b/modelmigration/base/db.go index 8385fc27354..3158aa3da47 100644 --- a/modelmigration/base/db.go +++ b/modelmigration/base/db.go @@ -480,13 +480,13 @@ func DropTableColumns(sess Session, tableName string, columnNames ...string) (er } // ModifyColumn will modify column's type or other property. SQLITE is not supported -func ModifyColumn(x EngineMigration, tableName string, col *schemas.Column) error { +func ModifyColumn(ctx context.Context, x EngineMigration, tableName string, col *schemas.Column) error { var indexes map[string]*schemas.Index var err error // MSSQL have to remove index at first, otherwise alter column will fail // ref. https://sqlzealots.com/2018/05/09/error-message-the-index-is-dependent-on-column-alter-table-alter-column-failed-because-one-or-more-objects-access-this-column/ if x.Dialect().URI().DBType == schemas.MSSQL { - indexes, err = x.Dialect().GetIndexes(x.DB(), context.Background(), tableName) + indexes, err = x.Dialect().GetIndexes(x.DB(), ctx, tableName) if err != nil { return err } diff --git a/modelmigration/migrations.go b/modelmigration/migrations.go index 76cd1649f61..9acf58764c3 100644 --- a/modelmigration/migrations.go +++ b/modelmigration/migrations.go @@ -49,15 +49,8 @@ type migration struct { } // newMigration creates a new migration -func newMigration[T func(base.EngineMigration) error | func(context.Context, base.EngineMigration) error](idNumber int64, desc string, fn T) *migration { - m := &migration{idNumber: idNumber, description: desc} - var ok bool - if m.migrate, ok = any(fn).(func(context.Context, base.EngineMigration) error); !ok { - m.migrate = func(ctx context.Context, x base.EngineMigration) error { - return any(fn).(func(base.EngineMigration) error)(x) - } - } - return m +func newMigration(idNumber int64, desc string, fn func(context.Context, base.EngineMigration) error) *migration { + return &migration{idNumber: idNumber, description: desc, migrate: fn} } // Migrate executes the migration @@ -72,7 +65,7 @@ type Version struct { } // Use noopMigration when there is a migration that has been no-oped -var noopMigration = func(_ base.EngineMigration) error { return nil } +var noopMigration = func(_ context.Context, _ base.EngineMigration) error { return nil } var preparedMigrations []*migration diff --git a/modelmigration/v1_10/v100.go b/modelmigration/v1_10/v100.go index 1832ac7b412..3197b362bde 100644 --- a/modelmigration/v1_10/v100.go +++ b/modelmigration/v1_10/v100.go @@ -4,6 +4,7 @@ package v1_10 import ( + "context" "net/url" "strings" "time" @@ -11,7 +12,7 @@ import ( "gitea.dev/modelmigration/base" ) -func UpdateMigrationServiceTypes(x base.EngineMigration) error { +func UpdateMigrationServiceTypes(_ context.Context, x base.EngineMigration) error { type Repository struct { ID int64 OriginalServiceType int `xorm:"index default(0)"` diff --git a/modelmigration/v1_10/v101.go b/modelmigration/v1_10/v101.go index 15210a28d9b..765687b7540 100644 --- a/modelmigration/v1_10/v101.go +++ b/modelmigration/v1_10/v101.go @@ -3,9 +3,13 @@ package v1_10 -import "gitea.dev/modelmigration/base" +import ( + "context" -func ChangeSomeColumnsLengthOfExternalLoginUser(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func ChangeSomeColumnsLengthOfExternalLoginUser(_ context.Context, x base.EngineMigration) error { type ExternalLoginUser struct { AccessToken string `xorm:"TEXT"` AccessTokenSecret string `xorm:"TEXT"` diff --git a/modelmigration/v1_10/v88.go b/modelmigration/v1_10/v88.go index 7fce41f884d..77c0c538eb0 100644 --- a/modelmigration/v1_10/v88.go +++ b/modelmigration/v1_10/v88.go @@ -4,6 +4,7 @@ package v1_10 import ( + "context" "crypto/sha1" "fmt" @@ -14,7 +15,7 @@ func hashContext(context string) string { return fmt.Sprintf("%x", sha1.Sum([]byte(context))) } -func AddCommitStatusContext(x base.EngineMigration) error { +func AddCommitStatusContext(_ context.Context, x base.EngineMigration) error { type CommitStatus struct { ID int64 `xorm:"pk autoincr"` ContextHash string `xorm:"char(40) index"` diff --git a/modelmigration/v1_10/v89.go b/modelmigration/v1_10/v89.go index 39f192312ec..cfae513c3fe 100644 --- a/modelmigration/v1_10/v89.go +++ b/modelmigration/v1_10/v89.go @@ -3,9 +3,13 @@ package v1_10 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddOriginalMigrationInfo(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddOriginalMigrationInfo(_ context.Context, x base.EngineMigration) error { // Issue see models/issue.go type Issue struct { OriginalAuthor string diff --git a/modelmigration/v1_10/v90.go b/modelmigration/v1_10/v90.go index c799421eeb3..8e8fd299ae2 100644 --- a/modelmigration/v1_10/v90.go +++ b/modelmigration/v1_10/v90.go @@ -3,9 +3,13 @@ package v1_10 -import "gitea.dev/modelmigration/base" +import ( + "context" -func ChangeSomeColumnsLengthOfRepo(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func ChangeSomeColumnsLengthOfRepo(_ context.Context, x base.EngineMigration) error { type Repository struct { ID int64 `xorm:"pk autoincr"` Description string `xorm:"TEXT"` diff --git a/modelmigration/v1_10/v91.go b/modelmigration/v1_10/v91.go index b7b21829c80..f68ba2c51c5 100644 --- a/modelmigration/v1_10/v91.go +++ b/modelmigration/v1_10/v91.go @@ -3,9 +3,13 @@ package v1_10 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddIndexOnRepositoryAndComment(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddIndexOnRepositoryAndComment(_ context.Context, x base.EngineMigration) error { type Repository struct { ID int64 `xorm:"pk autoincr"` OwnerID int64 `xorm:"index"` diff --git a/modelmigration/v1_10/v92.go b/modelmigration/v1_10/v92.go index 1dd41d3d64f..5433fa81bd5 100644 --- a/modelmigration/v1_10/v92.go +++ b/modelmigration/v1_10/v92.go @@ -4,12 +4,14 @@ package v1_10 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/builder" ) -func RemoveLingeringIndexStatus(x base.EngineMigration) error { +func RemoveLingeringIndexStatus(_ context.Context, x base.EngineMigration) error { _, err := x.Exec(builder.Delete(builder.NotIn("`repo_id`", builder.Select("`id`").From("`repository`"))).From("`repo_indexer_status`")) return err } diff --git a/modelmigration/v1_10/v93.go b/modelmigration/v1_10/v93.go index 1beaf85fd44..a499512b23c 100644 --- a/modelmigration/v1_10/v93.go +++ b/modelmigration/v1_10/v93.go @@ -3,9 +3,13 @@ package v1_10 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddEmailNotificationEnabledToUser(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddEmailNotificationEnabledToUser(_ context.Context, x base.EngineMigration) error { // User see models/user.go type User struct { EmailNotificationsPreference string `xorm:"VARCHAR(20) NOT NULL DEFAULT 'enabled'"` diff --git a/modelmigration/v1_10/v94.go b/modelmigration/v1_10/v94.go index bc806ef5052..725dc161691 100644 --- a/modelmigration/v1_10/v94.go +++ b/modelmigration/v1_10/v94.go @@ -3,9 +3,13 @@ package v1_10 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddStatusCheckColumnsForProtectedBranches(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddStatusCheckColumnsForProtectedBranches(_ context.Context, x base.EngineMigration) error { type ProtectedBranch struct { EnableStatusCheck bool `xorm:"NOT NULL DEFAULT false"` StatusCheckContexts []string `xorm:"JSON TEXT"` diff --git a/modelmigration/v1_10/v95.go b/modelmigration/v1_10/v95.go index 5730b5158ff..c12d59b5df7 100644 --- a/modelmigration/v1_10/v95.go +++ b/modelmigration/v1_10/v95.go @@ -3,9 +3,13 @@ package v1_10 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddCrossReferenceColumns(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddCrossReferenceColumns(_ context.Context, x base.EngineMigration) error { // Comment see models/comment.go type Comment struct { RefRepoID int64 `xorm:"index"` diff --git a/modelmigration/v1_10/v96.go b/modelmigration/v1_10/v96.go index 0f443112b1e..1c2050b0a13 100644 --- a/modelmigration/v1_10/v96.go +++ b/modelmigration/v1_10/v96.go @@ -4,6 +4,7 @@ package v1_10 import ( + "context" "os" "path/filepath" @@ -11,7 +12,7 @@ import ( "gitea.dev/modules/setting" ) -func DeleteOrphanedAttachments(x base.EngineMigration) error { +func DeleteOrphanedAttachments(_ context.Context, x base.EngineMigration) error { type Attachment struct { ID int64 `xorm:"pk autoincr"` UUID string `xorm:"uuid UNIQUE"` diff --git a/modelmigration/v1_10/v97.go b/modelmigration/v1_10/v97.go index f68fa76cd66..f3cf8b1a49e 100644 --- a/modelmigration/v1_10/v97.go +++ b/modelmigration/v1_10/v97.go @@ -3,9 +3,13 @@ package v1_10 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddRepoAdminChangeTeamAccessColumnForUser(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddRepoAdminChangeTeamAccessColumnForUser(_ context.Context, x base.EngineMigration) error { type User struct { RepoAdminChangeTeamAccess bool `xorm:"NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_10/v98.go b/modelmigration/v1_10/v98.go index cd707373ca8..7955dca812b 100644 --- a/modelmigration/v1_10/v98.go +++ b/modelmigration/v1_10/v98.go @@ -3,9 +3,13 @@ package v1_10 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddOriginalAuthorOnMigratedReleases(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddOriginalAuthorOnMigratedReleases(_ context.Context, x base.EngineMigration) error { type Release struct { ID int64 OriginalAuthor string diff --git a/modelmigration/v1_10/v99.go b/modelmigration/v1_10/v99.go index b3968359870..7ed8116a20d 100644 --- a/modelmigration/v1_10/v99.go +++ b/modelmigration/v1_10/v99.go @@ -4,11 +4,13 @@ package v1_10 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddTaskTable(x base.EngineMigration) error { +func AddTaskTable(_ context.Context, x base.EngineMigration) error { // TaskType defines task type type TaskType int diff --git a/modelmigration/v1_11/v102.go b/modelmigration/v1_11/v102.go index 1b004460c96..e2085f0e834 100644 --- a/modelmigration/v1_11/v102.go +++ b/modelmigration/v1_11/v102.go @@ -4,10 +4,12 @@ package v1_11 import ( + "context" + "gitea.dev/modelmigration/base" ) -func DropColumnHeadUserNameOnPullRequest(x base.EngineMigration) error { +func DropColumnHeadUserNameOnPullRequest(_ context.Context, x base.EngineMigration) error { sess := x.NewSession() defer sess.Close() if err := sess.Begin(); err != nil { diff --git a/modelmigration/v1_11/v103.go b/modelmigration/v1_11/v103.go index ce0601bf5a5..d1acbf9dbfe 100644 --- a/modelmigration/v1_11/v103.go +++ b/modelmigration/v1_11/v103.go @@ -3,9 +3,13 @@ package v1_11 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddWhitelistDeployKeysToBranches(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddWhitelistDeployKeysToBranches(_ context.Context, x base.EngineMigration) error { type ProtectedBranch struct { ID int64 WhitelistDeployKeys bool `xorm:"NOT NULL DEFAULT false"` diff --git a/modelmigration/v1_11/v104.go b/modelmigration/v1_11/v104.go index 74d8cfb6ea6..4a85f763fba 100644 --- a/modelmigration/v1_11/v104.go +++ b/modelmigration/v1_11/v104.go @@ -4,10 +4,12 @@ package v1_11 import ( + "context" + "gitea.dev/modelmigration/base" ) -func RemoveLabelUneededCols(x base.EngineMigration) error { +func RemoveLabelUneededCols(_ context.Context, x base.EngineMigration) error { // Make sure the columns exist before dropping them type Label struct { QueryString string diff --git a/modelmigration/v1_11/v105.go b/modelmigration/v1_11/v105.go index 182bb0cb73f..fcd1f6c58fc 100644 --- a/modelmigration/v1_11/v105.go +++ b/modelmigration/v1_11/v105.go @@ -3,9 +3,13 @@ package v1_11 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddTeamIncludesAllRepositories(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddTeamIncludesAllRepositories(_ context.Context, x base.EngineMigration) error { type Team struct { ID int64 `xorm:"pk autoincr"` IncludesAllRepositories bool `xorm:"NOT NULL DEFAULT false"` diff --git a/modelmigration/v1_11/v106.go b/modelmigration/v1_11/v106.go index 951e9c596b6..b1a587806de 100644 --- a/modelmigration/v1_11/v106.go +++ b/modelmigration/v1_11/v106.go @@ -3,7 +3,11 @@ package v1_11 -import "gitea.dev/modelmigration/base" +import ( + "context" + + "gitea.dev/modelmigration/base" +) // RepoWatchMode specifies what kind of watch the user has on a repository type RepoWatchMode int8 @@ -14,7 +18,7 @@ type Watch struct { Mode RepoWatchMode `xorm:"SMALLINT NOT NULL DEFAULT 1"` } -func AddModeColumnToWatch(x base.EngineMigration) error { +func AddModeColumnToWatch(_ context.Context, x base.EngineMigration) error { if err := x.Sync(new(Watch)); err != nil { return err } diff --git a/modelmigration/v1_11/v107.go b/modelmigration/v1_11/v107.go index 92aee188007..f3e4a19053f 100644 --- a/modelmigration/v1_11/v107.go +++ b/modelmigration/v1_11/v107.go @@ -3,9 +3,13 @@ package v1_11 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddTemplateToRepo(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddTemplateToRepo(_ context.Context, x base.EngineMigration) error { type Repository struct { IsTemplate bool `xorm:"INDEX NOT NULL DEFAULT false"` TemplateID int64 `xorm:"INDEX"` diff --git a/modelmigration/v1_11/v108.go b/modelmigration/v1_11/v108.go index fb22d23bc31..6c7ac17812c 100644 --- a/modelmigration/v1_11/v108.go +++ b/modelmigration/v1_11/v108.go @@ -3,9 +3,13 @@ package v1_11 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddCommentIDOnNotification(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddCommentIDOnNotification(_ context.Context, x base.EngineMigration) error { type Notification struct { ID int64 `xorm:"pk autoincr"` CommentID int64 diff --git a/modelmigration/v1_11/v109.go b/modelmigration/v1_11/v109.go index 26e50c493cb..735591ff538 100644 --- a/modelmigration/v1_11/v109.go +++ b/modelmigration/v1_11/v109.go @@ -3,9 +3,13 @@ package v1_11 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddCanCreateOrgRepoColumnForTeam(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddCanCreateOrgRepoColumnForTeam(_ context.Context, x base.EngineMigration) error { type Team struct { CanCreateOrgRepo bool `xorm:"NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_11/v110.go b/modelmigration/v1_11/v110.go index 7a24a3bb357..bc441db0069 100644 --- a/modelmigration/v1_11/v110.go +++ b/modelmigration/v1_11/v110.go @@ -4,12 +4,14 @@ package v1_11 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm/schemas" ) -func ChangeReviewContentToText(x base.EngineMigration) error { +func ChangeReviewContentToText(_ context.Context, x base.EngineMigration) error { switch x.Dialect().URI().DBType { case schemas.MYSQL: _, err := x.Exec("ALTER TABLE review MODIFY COLUMN content TEXT") diff --git a/modelmigration/v1_11/v111.go b/modelmigration/v1_11/v111.go index 25f911a6dfc..779665ad0e2 100644 --- a/modelmigration/v1_11/v111.go +++ b/modelmigration/v1_11/v111.go @@ -4,13 +4,14 @@ package v1_11 import ( + "context" "fmt" "slices" "gitea.dev/modelmigration/base" ) -func AddBranchProtectionCanPushAndEnableWhitelist(x base.EngineMigration) error { +func AddBranchProtectionCanPushAndEnableWhitelist(_ context.Context, x base.EngineMigration) error { type ProtectedBranch struct { CanPush bool `xorm:"NOT NULL DEFAULT false"` EnableApprovalsWhitelist bool `xorm:"NOT NULL DEFAULT false"` diff --git a/modelmigration/v1_11/v112.go b/modelmigration/v1_11/v112.go index 8250fc7f9fb..a336b219cc5 100644 --- a/modelmigration/v1_11/v112.go +++ b/modelmigration/v1_11/v112.go @@ -4,6 +4,7 @@ package v1_11 import ( + "context" "os" "path/filepath" @@ -14,7 +15,7 @@ import ( "xorm.io/builder" ) -func RemoveAttachmentMissedRepo(x base.EngineMigration) error { +func RemoveAttachmentMissedRepo(_ context.Context, x base.EngineMigration) error { type Attachment struct { UUID string `xorm:"uuid"` } diff --git a/modelmigration/v1_11/v113.go b/modelmigration/v1_11/v113.go index cd091110daa..7a700a88781 100644 --- a/modelmigration/v1_11/v113.go +++ b/modelmigration/v1_11/v113.go @@ -4,12 +4,13 @@ package v1_11 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func FeatureChangeTargetBranch(x base.EngineMigration) error { +func FeatureChangeTargetBranch(_ context.Context, x base.EngineMigration) error { type Comment struct { OldRef string NewRef string diff --git a/modelmigration/v1_11/v114.go b/modelmigration/v1_11/v114.go index 51e39a86702..4ddf10cfaed 100644 --- a/modelmigration/v1_11/v114.go +++ b/modelmigration/v1_11/v114.go @@ -4,12 +4,13 @@ package v1_11 import ( + "context" "net/url" "gitea.dev/modelmigration/base" ) -func SanitizeOriginalURL(x base.EngineMigration) error { +func SanitizeOriginalURL(_ context.Context, x base.EngineMigration) error { type Repository struct { ID int64 OriginalURL string `xorm:"VARCHAR(2048)"` diff --git a/modelmigration/v1_11/v115.go b/modelmigration/v1_11/v115.go index 1f086e79a7e..62cbc7ffd3d 100644 --- a/modelmigration/v1_11/v115.go +++ b/modelmigration/v1_11/v115.go @@ -4,6 +4,7 @@ package v1_11 import ( + "context" "crypto/md5" "fmt" "io" @@ -18,7 +19,7 @@ import ( "gitea.dev/modules/setting" ) -func RenameExistingUserAvatarName(x base.EngineMigration) error { +func RenameExistingUserAvatarName(_ context.Context, x base.EngineMigration) error { sess := x.NewSession() defer sess.Close() diff --git a/modelmigration/v1_11/v116.go b/modelmigration/v1_11/v116.go index 78399063fb1..b131dd0c4ec 100644 --- a/modelmigration/v1_11/v116.go +++ b/modelmigration/v1_11/v116.go @@ -3,9 +3,13 @@ package v1_11 -import "gitea.dev/modelmigration/base" +import ( + "context" -func ExtendTrackedTimes(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func ExtendTrackedTimes(_ context.Context, x base.EngineMigration) error { type TrackedTime struct { Time int64 `xorm:"NOT NULL"` Deleted bool `xorm:"NOT NULL DEFAULT false"` diff --git a/modelmigration/v1_12/v117.go b/modelmigration/v1_12/v117.go index 92582274d5b..99924661e26 100644 --- a/modelmigration/v1_12/v117.go +++ b/modelmigration/v1_12/v117.go @@ -3,9 +3,13 @@ package v1_12 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddBlockOnRejectedReviews(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddBlockOnRejectedReviews(_ context.Context, x base.EngineMigration) error { type ProtectedBranch struct { BlockOnRejectedReviews bool `xorm:"NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_12/v118.go b/modelmigration/v1_12/v118.go index d3129466705..74a0e302870 100644 --- a/modelmigration/v1_12/v118.go +++ b/modelmigration/v1_12/v118.go @@ -3,9 +3,13 @@ package v1_12 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddReviewCommitAndStale(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddReviewCommitAndStale(_ context.Context, x base.EngineMigration) error { type Review struct { CommitID string `xorm:"VARCHAR(40)"` Stale bool `xorm:"NOT NULL DEFAULT false"` diff --git a/modelmigration/v1_12/v119.go b/modelmigration/v1_12/v119.go index 968faa444da..6803f0bc5b3 100644 --- a/modelmigration/v1_12/v119.go +++ b/modelmigration/v1_12/v119.go @@ -3,9 +3,13 @@ package v1_12 -import "gitea.dev/modelmigration/base" +import ( + "context" -func FixMigratedRepositoryServiceType(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func FixMigratedRepositoryServiceType(_ context.Context, x base.EngineMigration) error { // structs.GithubService: // GithubService = 2 _, err := x.Exec("UPDATE repository SET original_service_type = ? WHERE original_url LIKE 'https://github.com/%'", 2) diff --git a/modelmigration/v1_12/v120.go b/modelmigration/v1_12/v120.go index 7f96b4e6583..3300f21ce34 100644 --- a/modelmigration/v1_12/v120.go +++ b/modelmigration/v1_12/v120.go @@ -3,9 +3,13 @@ package v1_12 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddOwnerNameOnRepository(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddOwnerNameOnRepository(_ context.Context, x base.EngineMigration) error { type Repository struct { OwnerName string } diff --git a/modelmigration/v1_12/v121.go b/modelmigration/v1_12/v121.go index 965ef176014..2772aa07d5f 100644 --- a/modelmigration/v1_12/v121.go +++ b/modelmigration/v1_12/v121.go @@ -3,9 +3,13 @@ package v1_12 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddIsRestricted(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddIsRestricted(_ context.Context, x base.EngineMigration) error { // User see models/user.go type User struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_12/v122.go b/modelmigration/v1_12/v122.go index 06f3d0a7aca..41b56391a4f 100644 --- a/modelmigration/v1_12/v122.go +++ b/modelmigration/v1_12/v122.go @@ -3,9 +3,13 @@ package v1_12 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddRequireSignedCommits(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddRequireSignedCommits(_ context.Context, x base.EngineMigration) error { type ProtectedBranch struct { RequireSignedCommits bool `xorm:"NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_12/v123.go b/modelmigration/v1_12/v123.go index 6d82f73c696..5d611e411ee 100644 --- a/modelmigration/v1_12/v123.go +++ b/modelmigration/v1_12/v123.go @@ -3,9 +3,13 @@ package v1_12 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddReactionOriginals(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddReactionOriginals(_ context.Context, x base.EngineMigration) error { type Reaction struct { OriginalAuthorID int64 `xorm:"INDEX NOT NULL DEFAULT(0)"` OriginalAuthor string diff --git a/modelmigration/v1_12/v124.go b/modelmigration/v1_12/v124.go index 455bdfa29e5..e3526a6987a 100644 --- a/modelmigration/v1_12/v124.go +++ b/modelmigration/v1_12/v124.go @@ -3,9 +3,13 @@ package v1_12 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddUserRepoMissingColumns(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddUserRepoMissingColumns(_ context.Context, x base.EngineMigration) error { type VisibleType int type User struct { PasswdHashAlgo string `xorm:"NOT NULL DEFAULT 'pbkdf2'"` diff --git a/modelmigration/v1_12/v125.go b/modelmigration/v1_12/v125.go index 8c031eca487..148cd361d6b 100644 --- a/modelmigration/v1_12/v125.go +++ b/modelmigration/v1_12/v125.go @@ -4,12 +4,13 @@ package v1_12 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddReviewMigrateInfo(x base.EngineMigration) error { +func AddReviewMigrateInfo(_ context.Context, x base.EngineMigration) error { type Review struct { OriginalAuthor string OriginalAuthorID int64 diff --git a/modelmigration/v1_12/v126.go b/modelmigration/v1_12/v126.go index 1427993f793..b72924bfb78 100644 --- a/modelmigration/v1_12/v126.go +++ b/modelmigration/v1_12/v126.go @@ -4,12 +4,14 @@ package v1_12 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/builder" ) -func FixTopicRepositoryCount(x base.EngineMigration) error { +func FixTopicRepositoryCount(_ context.Context, x base.EngineMigration) error { _, err := x.Exec(builder.Delete(builder.NotIn("`repo_id`", builder.Select("`id`").From("`repository`"))).From("`repo_topic`")) if err != nil { return err diff --git a/modelmigration/v1_12/v127.go b/modelmigration/v1_12/v127.go index 455cd3c5d03..d8e25c7d281 100644 --- a/modelmigration/v1_12/v127.go +++ b/modelmigration/v1_12/v127.go @@ -4,13 +4,14 @@ package v1_12 import ( + "context" "fmt" "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddLanguageStats(x base.EngineMigration) error { +func AddLanguageStats(_ context.Context, x base.EngineMigration) error { // LanguageStat see models/repo_language_stats.go type LanguageStat struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_12/v129.go b/modelmigration/v1_12/v129.go index 15d85324ad9..ac1585819b4 100644 --- a/modelmigration/v1_12/v129.go +++ b/modelmigration/v1_12/v129.go @@ -3,9 +3,13 @@ package v1_12 -import "gitea.dev/modelmigration/base" +import ( + "context" -func PurgeUnusedDependencies(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func PurgeUnusedDependencies(_ context.Context, x base.EngineMigration) error { if _, err := x.Exec("DELETE FROM issue_dependency WHERE issue_id NOT IN (SELECT id FROM issue)"); err != nil { return err } diff --git a/modelmigration/v1_12/v130.go b/modelmigration/v1_12/v130.go index 343bac4985b..46ededebdf6 100644 --- a/modelmigration/v1_12/v130.go +++ b/modelmigration/v1_12/v130.go @@ -4,12 +4,14 @@ package v1_12 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/json" "gitea.dev/modules/setting" ) -func ExpandWebhooks(x base.EngineMigration) error { +func ExpandWebhooks(_ context.Context, x base.EngineMigration) error { type HookEvents struct { Create bool `json:"create"` Delete bool `json:"delete"` diff --git a/modelmigration/v1_12/v131.go b/modelmigration/v1_12/v131.go index 9a78926aded..8d37a1e4006 100644 --- a/modelmigration/v1_12/v131.go +++ b/modelmigration/v1_12/v131.go @@ -4,12 +4,13 @@ package v1_12 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddSystemWebhookColumn(x base.EngineMigration) error { +func AddSystemWebhookColumn(_ context.Context, x base.EngineMigration) error { type Webhook struct { IsSystemWebhook bool `xorm:"NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_12/v132.go b/modelmigration/v1_12/v132.go index b788d72a579..10561c52b36 100644 --- a/modelmigration/v1_12/v132.go +++ b/modelmigration/v1_12/v132.go @@ -4,12 +4,13 @@ package v1_12 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddBranchProtectionProtectedFilesColumn(x base.EngineMigration) error { +func AddBranchProtectionProtectedFilesColumn(_ context.Context, x base.EngineMigration) error { type ProtectedBranch struct { ProtectedFilePatterns string `xorm:"TEXT"` } diff --git a/modelmigration/v1_12/v133.go b/modelmigration/v1_12/v133.go index 435a4c64e88..04d8e9f42a1 100644 --- a/modelmigration/v1_12/v133.go +++ b/modelmigration/v1_12/v133.go @@ -3,9 +3,13 @@ package v1_12 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddEmailHashTable(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddEmailHashTable(_ context.Context, x base.EngineMigration) error { // EmailHash represents a pre-generated hash map type EmailHash struct { Hash string `xorm:"pk varchar(32)"` diff --git a/modelmigration/v1_12/v135.go b/modelmigration/v1_12/v135.go index ed84ec01b99..988be066990 100644 --- a/modelmigration/v1_12/v135.go +++ b/modelmigration/v1_12/v135.go @@ -4,12 +4,13 @@ package v1_12 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddOrgIDLabelColumn(x base.EngineMigration) error { +func AddOrgIDLabelColumn(_ context.Context, x base.EngineMigration) error { type Label struct { OrgID int64 `xorm:"INDEX"` } diff --git a/modelmigration/v1_12/v136.go b/modelmigration/v1_12/v136.go index 7a85484f93f..46d577cbc82 100644 --- a/modelmigration/v1_12/v136.go +++ b/modelmigration/v1_12/v136.go @@ -4,6 +4,7 @@ package v1_12 import ( + "context" "fmt" "math" "time" @@ -15,7 +16,7 @@ import ( "gitea.dev/modules/setting" ) -func AddCommitDivergenceToPulls(x base.EngineMigration) error { +func AddCommitDivergenceToPulls(_ context.Context, x base.EngineMigration) error { type Repository struct { ID int64 `xorm:"pk autoincr"` OwnerID int64 `xorm:"UNIQUE(s) index"` diff --git a/modelmigration/v1_12/v137.go b/modelmigration/v1_12/v137.go index 0dc5af986e3..b03bd044fa3 100644 --- a/modelmigration/v1_12/v137.go +++ b/modelmigration/v1_12/v137.go @@ -3,9 +3,13 @@ package v1_12 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddBlockOnOutdatedBranch(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddBlockOnOutdatedBranch(_ context.Context, x base.EngineMigration) error { type ProtectedBranch struct { BlockOnOutdatedBranch bool `xorm:"NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_12/v138.go b/modelmigration/v1_12/v138.go index c59d1f78795..4fa7e8a1eb2 100644 --- a/modelmigration/v1_12/v138.go +++ b/modelmigration/v1_12/v138.go @@ -4,12 +4,13 @@ package v1_12 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddResolveDoerIDCommentColumn(x base.EngineMigration) error { +func AddResolveDoerIDCommentColumn(_ context.Context, x base.EngineMigration) error { type Comment struct { ResolveDoerID int64 } diff --git a/modelmigration/v1_12/v139.go b/modelmigration/v1_12/v139.go index 9e21ab5e0a8..669fa4e9417 100644 --- a/modelmigration/v1_12/v139.go +++ b/modelmigration/v1_12/v139.go @@ -4,11 +4,13 @@ package v1_12 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/setting" ) -func PrependRefsHeadsToIssueRefs(x base.EngineMigration) error { +func PrependRefsHeadsToIssueRefs(_ context.Context, x base.EngineMigration) error { var query string switch { diff --git a/modelmigration/v1_13/v140.go b/modelmigration/v1_13/v140.go index 55efa6b637a..162bc93d58c 100644 --- a/modelmigration/v1_13/v140.go +++ b/modelmigration/v1_13/v140.go @@ -4,13 +4,14 @@ package v1_13 import ( + "context" "fmt" "gitea.dev/modelmigration/base" "gitea.dev/modules/setting" ) -func FixLanguageStatsToSaveSize(x base.EngineMigration) error { +func FixLanguageStatsToSaveSize(_ context.Context, x base.EngineMigration) error { // LanguageStat see models/repo_language_stats.go type LanguageStat struct { Size int64 `xorm:"NOT NULL DEFAULT 0"` diff --git a/modelmigration/v1_13/v141.go b/modelmigration/v1_13/v141.go index 435dc4bf386..660e684c732 100644 --- a/modelmigration/v1_13/v141.go +++ b/modelmigration/v1_13/v141.go @@ -4,12 +4,13 @@ package v1_13 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddKeepActivityPrivateUserColumn(x base.EngineMigration) error { +func AddKeepActivityPrivateUserColumn(_ context.Context, x base.EngineMigration) error { type User struct { KeepActivityPrivate bool `xorm:"NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_13/v142.go b/modelmigration/v1_13/v142.go index e98f4075e92..5f9ecdc1e77 100644 --- a/modelmigration/v1_13/v142.go +++ b/modelmigration/v1_13/v142.go @@ -4,13 +4,15 @@ package v1_13 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/log" "xorm.io/builder" ) -func SetIsArchivedToFalse(x base.EngineMigration) error { +func SetIsArchivedToFalse(_ context.Context, x base.EngineMigration) error { type Repository struct { IsArchived bool `xorm:"INDEX"` } diff --git a/modelmigration/v1_13/v143.go b/modelmigration/v1_13/v143.go index 2c299f7b5a2..3e92f51effe 100644 --- a/modelmigration/v1_13/v143.go +++ b/modelmigration/v1_13/v143.go @@ -4,11 +4,13 @@ package v1_13 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/log" ) -func RecalculateStars(x base.EngineMigration) (err error) { +func RecalculateStars(_ context.Context, x base.EngineMigration) (err error) { // because of issue https://github.com/go-gitea/gitea/issues/11949, // recalculate Stars number for all users to fully fix it. diff --git a/modelmigration/v1_13/v144.go b/modelmigration/v1_13/v144.go index f41c6199a80..d29fcd3ad6c 100644 --- a/modelmigration/v1_13/v144.go +++ b/modelmigration/v1_13/v144.go @@ -4,13 +4,15 @@ package v1_13 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/log" "xorm.io/builder" ) -func UpdateMatrixWebhookHTTPMethod(x base.EngineMigration) error { +func UpdateMatrixWebhookHTTPMethod(_ context.Context, x base.EngineMigration) error { matrixHookTaskType := 9 // value comes from the models package type Webhook struct { HTTPMethod string diff --git a/modelmigration/v1_13/v145.go b/modelmigration/v1_13/v145.go index 6a99fb017a0..fc70e8a502a 100644 --- a/modelmigration/v1_13/v145.go +++ b/modelmigration/v1_13/v145.go @@ -4,13 +4,14 @@ package v1_13 import ( + "context" "fmt" "gitea.dev/modelmigration/base" "gitea.dev/modules/setting" ) -func IncreaseLanguageField(x base.EngineMigration) error { +func IncreaseLanguageField(_ context.Context, x base.EngineMigration) error { type LanguageStat struct { RepoID int64 `xorm:"UNIQUE(s) INDEX NOT NULL"` Language string `xorm:"VARCHAR(50) UNIQUE(s) INDEX NOT NULL"` diff --git a/modelmigration/v1_13/v146.go b/modelmigration/v1_13/v146.go index ce37105c1f5..6b766f353b6 100644 --- a/modelmigration/v1_13/v146.go +++ b/modelmigration/v1_13/v146.go @@ -4,11 +4,13 @@ package v1_13 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddProjectsInfo(x base.EngineMigration) error { +func AddProjectsInfo(_ context.Context, x base.EngineMigration) error { // Create new tables type ( ProjectType uint8 diff --git a/modelmigration/v1_13/v147.go b/modelmigration/v1_13/v147.go index beb19cf62ee..8abae41b711 100644 --- a/modelmigration/v1_13/v147.go +++ b/modelmigration/v1_13/v147.go @@ -4,11 +4,13 @@ package v1_13 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func CreateReviewsForCodeComments(x base.EngineMigration) error { +func CreateReviewsForCodeComments(_ context.Context, x base.EngineMigration) error { // Review type Review struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_13/v148.go b/modelmigration/v1_13/v148.go index 2244302b18e..ab073dc20bc 100644 --- a/modelmigration/v1_13/v148.go +++ b/modelmigration/v1_13/v148.go @@ -3,9 +3,13 @@ package v1_13 -import "gitea.dev/modelmigration/base" +import ( + "context" -func PurgeInvalidDependenciesComments(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func PurgeInvalidDependenciesComments(_ context.Context, x base.EngineMigration) error { _, err := x.Exec("DELETE FROM comment WHERE dependent_issue_id != 0 AND dependent_issue_id NOT IN (SELECT id FROM issue)") return err } diff --git a/modelmigration/v1_13/v149.go b/modelmigration/v1_13/v149.go index ccef7814e5e..d9c2770df7b 100644 --- a/modelmigration/v1_13/v149.go +++ b/modelmigration/v1_13/v149.go @@ -4,13 +4,14 @@ package v1_13 import ( + "context" "fmt" "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddCreatedAndUpdatedToMilestones(x base.EngineMigration) error { +func AddCreatedAndUpdatedToMilestones(_ context.Context, x base.EngineMigration) error { type Milestone struct { CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"` UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"` diff --git a/modelmigration/v1_13/v150.go b/modelmigration/v1_13/v150.go index 1b223070576..1241cc49d38 100644 --- a/modelmigration/v1_13/v150.go +++ b/modelmigration/v1_13/v150.go @@ -4,11 +4,13 @@ package v1_13 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddPrimaryKeyToRepoTopic(x base.EngineMigration) error { +func AddPrimaryKeyToRepoTopic(_ context.Context, x base.EngineMigration) error { // Topic represents a topic of repositories type Topic struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_13/v151.go b/modelmigration/v1_13/v151.go index becbcb9af14..313182d0fb2 100644 --- a/modelmigration/v1_13/v151.go +++ b/modelmigration/v1_13/v151.go @@ -16,7 +16,7 @@ import ( "xorm.io/xorm/schemas" ) -func SetDefaultPasswordToArgon2(x base.EngineMigration) error { +func SetDefaultPasswordToArgon2(ctx context.Context, x base.EngineMigration) error { switch { case setting.Database.Type.IsMySQL(): _, err := x.Exec("ALTER TABLE `user` ALTER passwd_hash_algo SET DEFAULT 'argon2';") @@ -91,7 +91,7 @@ func SetDefaultPasswordToArgon2(x base.EngineMigration) error { tempTableName := "tmp_recreate__user" column.Default = "'argon2'" - createTableSQL, _, err := x.Dialect().CreateTableSQL(context.Background(), x.DB(), table, tempTableName) + createTableSQL, _, err := x.Dialect().CreateTableSQL(ctx, x.DB(), table, tempTableName) if err != nil { return err } diff --git a/modelmigration/v1_13/v152.go b/modelmigration/v1_13/v152.go index a14a81ab1f2..b8279b2226e 100644 --- a/modelmigration/v1_13/v152.go +++ b/modelmigration/v1_13/v152.go @@ -3,9 +3,13 @@ package v1_13 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddTrustModelToRepository(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddTrustModelToRepository(_ context.Context, x base.EngineMigration) error { type Repository struct { TrustModel int } diff --git a/modelmigration/v1_13/v153.go b/modelmigration/v1_13/v153.go index e0609fec817..0f0d64c482f 100644 --- a/modelmigration/v1_13/v153.go +++ b/modelmigration/v1_13/v153.go @@ -3,9 +3,13 @@ package v1_13 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddTeamReviewRequestSupport(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddTeamReviewRequestSupport(_ context.Context, x base.EngineMigration) error { type Review struct { ReviewerTeamID int64 `xorm:"NOT NULL DEFAULT 0"` } diff --git a/modelmigration/v1_13/v154.go b/modelmigration/v1_13/v154.go index ee70f0d85cc..6ca94de4558 100644 --- a/modelmigration/v1_13/v154.go +++ b/modelmigration/v1_13/v154.go @@ -4,11 +4,13 @@ package v1_13 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddTimeStamps(x base.EngineMigration) error { +func AddTimeStamps(_ context.Context, x base.EngineMigration) error { // this will add timestamps where it is useful to have // Star represents a starred repo by an user. diff --git a/modelmigration/v1_14/v155.go b/modelmigration/v1_14/v155.go index cd5d30991da..7d8f8361d6d 100644 --- a/modelmigration/v1_14/v155.go +++ b/modelmigration/v1_14/v155.go @@ -4,12 +4,13 @@ package v1_14 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddChangedProtectedFilesPullRequestColumn(x base.EngineMigration) error { +func AddChangedProtectedFilesPullRequestColumn(_ context.Context, x base.EngineMigration) error { type PullRequest struct { ChangedProtectedFiles []string `xorm:"TEXT JSON"` } diff --git a/modelmigration/v1_14/v157.go b/modelmigration/v1_14/v157.go index 55ae2293190..9f6306a949f 100644 --- a/modelmigration/v1_14/v157.go +++ b/modelmigration/v1_14/v157.go @@ -3,9 +3,13 @@ package v1_14 -import "gitea.dev/modelmigration/base" +import ( + "context" -func FixRepoTopics(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func FixRepoTopics(_ context.Context, x base.EngineMigration) error { type Repository struct { ID int64 `xorm:"pk autoincr"` Topics []string `xorm:"TEXT JSON"` diff --git a/modelmigration/v1_14/v158.go b/modelmigration/v1_14/v158.go index 56d1e6a7db6..40fa324ec59 100644 --- a/modelmigration/v1_14/v158.go +++ b/modelmigration/v1_14/v158.go @@ -4,6 +4,7 @@ package v1_14 import ( + "context" "errors" "strconv" @@ -12,7 +13,7 @@ import ( "gitea.dev/modules/setting" ) -func UpdateCodeCommentReplies(x base.EngineMigration) error { +func UpdateCodeCommentReplies(_ context.Context, x base.EngineMigration) error { type Comment struct { ID int64 `xorm:"pk autoincr"` CommitSHA string `xorm:"VARCHAR(40)"` diff --git a/modelmigration/v1_14/v159.go b/modelmigration/v1_14/v159.go index 363ccbfb7db..8a6a073b68d 100644 --- a/modelmigration/v1_14/v159.go +++ b/modelmigration/v1_14/v159.go @@ -4,11 +4,13 @@ package v1_14 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func UpdateReactionConstraint(x base.EngineMigration) error { +func UpdateReactionConstraint(_ context.Context, x base.EngineMigration) error { // Reaction represents a reactions on issues and comments. type Reaction struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_14/v160.go b/modelmigration/v1_14/v160.go index 5bdd552bacd..76ad7a2c2c1 100644 --- a/modelmigration/v1_14/v160.go +++ b/modelmigration/v1_14/v160.go @@ -3,9 +3,13 @@ package v1_14 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddBlockOnOfficialReviewRequests(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddBlockOnOfficialReviewRequests(_ context.Context, x base.EngineMigration) error { type ProtectedBranch struct { BlockOnOfficialReviewRequests bool `xorm:"NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_14/v161.go b/modelmigration/v1_14/v161.go index 85c0ed5b44b..7299f1fb01b 100644 --- a/modelmigration/v1_14/v161.go +++ b/modelmigration/v1_14/v161.go @@ -9,7 +9,7 @@ import ( "gitea.dev/modelmigration/base" ) -func ConvertTaskTypeToString(x base.EngineMigration) error { +func ConvertTaskTypeToString(ctx context.Context, x base.EngineMigration) error { const ( GOGS int = iota + 1 SLACK @@ -44,7 +44,7 @@ func ConvertTaskTypeToString(x base.EngineMigration) error { } // to keep the migration could be rerun - exist, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "hook_task", "type") + exist, err := x.Dialect().IsColumnExist(x.DB(), ctx, "hook_task", "type") if err != nil { return err } diff --git a/modelmigration/v1_14/v162.go b/modelmigration/v1_14/v162.go index eb2ebe9dce1..cc0a3133929 100644 --- a/modelmigration/v1_14/v162.go +++ b/modelmigration/v1_14/v162.go @@ -4,10 +4,12 @@ package v1_14 import ( + "context" + "gitea.dev/modelmigration/base" ) -func ConvertWebhookTaskTypeToString(x base.EngineMigration) error { +func ConvertWebhookTaskTypeToString(_ context.Context, x base.EngineMigration) error { const ( GOGS int = iota + 1 SLACK diff --git a/modelmigration/v1_14/v163.go b/modelmigration/v1_14/v163.go index d69b5051db1..6b976282a15 100644 --- a/modelmigration/v1_14/v163.go +++ b/modelmigration/v1_14/v163.go @@ -4,10 +4,12 @@ package v1_14 import ( + "context" + "gitea.dev/modelmigration/base" ) -func ConvertTopicNameFrom25To50(x base.EngineMigration) error { +func ConvertTopicNameFrom25To50(_ context.Context, x base.EngineMigration) error { type Topic struct { ID int64 `xorm:"pk autoincr"` Name string `xorm:"UNIQUE VARCHAR(50)"` diff --git a/modelmigration/v1_14/v164.go b/modelmigration/v1_14/v164.go index ffc0b44b684..f54f2eeb6aa 100644 --- a/modelmigration/v1_14/v164.go +++ b/modelmigration/v1_14/v164.go @@ -4,6 +4,7 @@ package v1_14 import ( + "context" "fmt" "gitea.dev/modelmigration/base" @@ -29,7 +30,7 @@ func (grant *OAuth2Grant) TableName() string { return "oauth2_grant" } -func AddScopeAndNonceColumnsToOAuth2Grant(x base.EngineMigration) error { +func AddScopeAndNonceColumnsToOAuth2Grant(_ context.Context, x base.EngineMigration) error { if err := x.Sync(new(OAuth2Grant)); err != nil { return fmt.Errorf("Sync: %w", err) } diff --git a/modelmigration/v1_14/v165.go b/modelmigration/v1_14/v165.go index dc6577ea636..1c3f6cb7ab0 100644 --- a/modelmigration/v1_14/v165.go +++ b/modelmigration/v1_14/v165.go @@ -4,19 +4,21 @@ package v1_14 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm/schemas" ) -func ConvertHookTaskTypeToVarcharAndTrim(x base.EngineMigration) error { +func ConvertHookTaskTypeToVarcharAndTrim(ctx context.Context, x base.EngineMigration) error { dbType := x.Dialect().URI().DBType if dbType == schemas.SQLITE { // For SQLITE, varchar or char will always be represented as TEXT return nil } // HookTask: Typ string `xorm:"VARCHAR(16) index"` - if err := base.ModifyColumn(x, "hook_task", &schemas.Column{ + if err := base.ModifyColumn(ctx, x, "hook_task", &schemas.Column{ Name: "typ", SQLType: schemas.SQLType{ Name: "VARCHAR", @@ -39,7 +41,7 @@ func ConvertHookTaskTypeToVarcharAndTrim(x base.EngineMigration) error { } // Webhook: Type string `xorm:"VARCHAR(16) index"` - if err := base.ModifyColumn(x, "webhook", &schemas.Column{ + if err := base.ModifyColumn(ctx, x, "webhook", &schemas.Column{ Name: "type", SQLType: schemas.SQLType{ Name: "VARCHAR", diff --git a/modelmigration/v1_14/v166.go b/modelmigration/v1_14/v166.go index 7486e999be6..08e1d3e24f4 100644 --- a/modelmigration/v1_14/v166.go +++ b/modelmigration/v1_14/v166.go @@ -4,6 +4,7 @@ package v1_14 import ( + "context" "crypto/sha256" "encoding/hex" @@ -16,7 +17,7 @@ import ( "xorm.io/builder" ) -func RecalculateUserEmptyPWD(x base.EngineMigration) (err error) { +func RecalculateUserEmptyPWD(_ context.Context, x base.EngineMigration) (err error) { const ( algoBcrypt = "bcrypt" algoScrypt = "scrypt" diff --git a/modelmigration/v1_14/v167.go b/modelmigration/v1_14/v167.go index 38288a5d27e..429ec7fe579 100644 --- a/modelmigration/v1_14/v167.go +++ b/modelmigration/v1_14/v167.go @@ -4,12 +4,13 @@ package v1_14 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddUserRedirect(x base.EngineMigration) (err error) { +func AddUserRedirect(_ context.Context, x base.EngineMigration) (err error) { type UserRedirect struct { ID int64 `xorm:"pk autoincr"` LowerName string `xorm:"UNIQUE(s) INDEX NOT NULL"` diff --git a/modelmigration/v1_14/v168.go b/modelmigration/v1_14/v168.go index 8b7d02335eb..79eddd8d751 100644 --- a/modelmigration/v1_14/v168.go +++ b/modelmigration/v1_14/v168.go @@ -3,8 +3,12 @@ package v1_14 -import "gitea.dev/modelmigration/base" +import ( + "context" -func RecreateUserTableToFixDefaultValues(_ base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func RecreateUserTableToFixDefaultValues(_ context.Context, _ base.EngineMigration) error { return nil } diff --git a/modelmigration/v1_14/v169.go b/modelmigration/v1_14/v169.go index 4852c873169..c8238279001 100644 --- a/modelmigration/v1_14/v169.go +++ b/modelmigration/v1_14/v169.go @@ -3,9 +3,13 @@ package v1_14 -import "gitea.dev/modelmigration/base" +import ( + "context" -func CommentTypeDeleteBranchUseOldRef(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func CommentTypeDeleteBranchUseOldRef(_ context.Context, x base.EngineMigration) error { _, err := x.Exec("UPDATE comment SET old_ref = commit_sha, commit_sha = '' WHERE type = 11") return err } diff --git a/modelmigration/v1_14/v170.go b/modelmigration/v1_14/v170.go index c43dc48e38d..5f3b3a2c267 100644 --- a/modelmigration/v1_14/v170.go +++ b/modelmigration/v1_14/v170.go @@ -4,12 +4,13 @@ package v1_14 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddDismissedReviewColumn(x base.EngineMigration) error { +func AddDismissedReviewColumn(_ context.Context, x base.EngineMigration) error { type Review struct { Dismissed bool `xorm:"NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_14/v171.go b/modelmigration/v1_14/v171.go index 023af757b59..32e47d96a1f 100644 --- a/modelmigration/v1_14/v171.go +++ b/modelmigration/v1_14/v171.go @@ -4,12 +4,13 @@ package v1_14 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddSortingColToProjectBoard(x base.EngineMigration) error { +func AddSortingColToProjectBoard(_ context.Context, x base.EngineMigration) error { type ProjectBoard struct { Sorting int8 `xorm:"NOT NULL DEFAULT 0"` } diff --git a/modelmigration/v1_14/v172.go b/modelmigration/v1_14/v172.go index bea2931ecb4..6506b90ee19 100644 --- a/modelmigration/v1_14/v172.go +++ b/modelmigration/v1_14/v172.go @@ -4,11 +4,13 @@ package v1_14 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddSessionTable(x base.EngineMigration) error { +func AddSessionTable(_ context.Context, x base.EngineMigration) error { type Session struct { Key string `xorm:"pk CHAR(16)"` Data []byte `xorm:"BLOB"` diff --git a/modelmigration/v1_14/v173.go b/modelmigration/v1_14/v173.go index 6516436c91b..0c35153c61b 100644 --- a/modelmigration/v1_14/v173.go +++ b/modelmigration/v1_14/v173.go @@ -4,12 +4,13 @@ package v1_14 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddTimeIDCommentColumn(x base.EngineMigration) error { +func AddTimeIDCommentColumn(_ context.Context, x base.EngineMigration) error { type Comment struct { TimeID int64 } diff --git a/modelmigration/v1_14/v174.go b/modelmigration/v1_14/v174.go index da3635ad82b..f2bb85a2896 100644 --- a/modelmigration/v1_14/v174.go +++ b/modelmigration/v1_14/v174.go @@ -4,12 +4,13 @@ package v1_14 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddRepoTransfer(x base.EngineMigration) error { +func AddRepoTransfer(_ context.Context, x base.EngineMigration) error { type RepoTransfer struct { ID int64 `xorm:"pk autoincr"` DoerID int64 diff --git a/modelmigration/v1_14/v175.go b/modelmigration/v1_14/v175.go index a52d13a11a6..126d2347bdb 100644 --- a/modelmigration/v1_14/v175.go +++ b/modelmigration/v1_14/v175.go @@ -4,6 +4,7 @@ package v1_14 import ( + "context" "fmt" "regexp" @@ -12,7 +13,7 @@ import ( "gitea.dev/modules/setting" ) -func FixPostgresIDSequences(x base.EngineMigration) error { +func FixPostgresIDSequences(_ context.Context, x base.EngineMigration) error { if !setting.Database.Type.IsPostgreSQL() { return nil } diff --git a/modelmigration/v1_14/v176.go b/modelmigration/v1_14/v176.go index ae1d24c4d27..af41d51217f 100644 --- a/modelmigration/v1_14/v176.go +++ b/modelmigration/v1_14/v176.go @@ -3,12 +3,16 @@ package v1_14 -import "gitea.dev/modelmigration/base" +import ( + "context" + + "gitea.dev/modelmigration/base" +) // RemoveInvalidLabels looks through the database to look for comments and issue_labels // that refer to labels do not belong to the repository or organization that repository // that the issue is in -func RemoveInvalidLabels(x base.EngineMigration) error { +func RemoveInvalidLabels(_ context.Context, x base.EngineMigration) error { type Comment struct { ID int64 `xorm:"pk autoincr"` Type int `xorm:"INDEX"` diff --git a/modelmigration/v1_14/v176_test.go b/modelmigration/v1_14/v176_test.go index efd0b97e9c4..003e3537465 100644 --- a/modelmigration/v1_14/v176_test.go +++ b/modelmigration/v1_14/v176_test.go @@ -79,7 +79,7 @@ func Test_RemoveInvalidLabels(t *testing.T) { } // Run the migration - if err := RemoveInvalidLabels(x); err != nil { + if err := RemoveInvalidLabels(t.Context(), x); err != nil { t.Errorf("unable to RemoveInvalidLabels: %v", err) } diff --git a/modelmigration/v1_14/v177.go b/modelmigration/v1_14/v177.go index b85d266f09a..035f949b5c4 100644 --- a/modelmigration/v1_14/v177.go +++ b/modelmigration/v1_14/v177.go @@ -4,13 +4,14 @@ package v1_14 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) // DeleteOrphanedIssueLabels looks through the database for issue_labels where the label no longer exists and deletes them. -func DeleteOrphanedIssueLabels(x base.EngineMigration) error { +func DeleteOrphanedIssueLabels(_ context.Context, x base.EngineMigration) error { type IssueLabel struct { ID int64 `xorm:"pk autoincr"` IssueID int64 `xorm:"UNIQUE(s)"` diff --git a/modelmigration/v1_14/v177_test.go b/modelmigration/v1_14/v177_test.go index 49f00ca2923..15f6a638cd4 100644 --- a/modelmigration/v1_14/v177_test.go +++ b/modelmigration/v1_14/v177_test.go @@ -55,7 +55,7 @@ func Test_DeleteOrphanedIssueLabels(t *testing.T) { } // Run the migration - if err := DeleteOrphanedIssueLabels(x); err != nil { + if err := DeleteOrphanedIssueLabels(t.Context(), x); err != nil { assert.NoError(t, err) return } diff --git a/modelmigration/v1_15/v178.go b/modelmigration/v1_15/v178.go index ef17fc699ed..ab94754ef98 100644 --- a/modelmigration/v1_15/v178.go +++ b/modelmigration/v1_15/v178.go @@ -3,9 +3,13 @@ package v1_15 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddLFSMirrorColumns(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddLFSMirrorColumns(_ context.Context, x base.EngineMigration) error { type Mirror struct { LFS bool `xorm:"lfs_enabled NOT NULL DEFAULT false"` LFSEndpoint string `xorm:"lfs_endpoint TEXT"` diff --git a/modelmigration/v1_15/v179.go b/modelmigration/v1_15/v179.go index 8597736ccb6..f335ca76aa8 100644 --- a/modelmigration/v1_15/v179.go +++ b/modelmigration/v1_15/v179.go @@ -4,19 +4,21 @@ package v1_15 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm/schemas" ) -func ConvertAvatarURLToText(x base.EngineMigration) error { +func ConvertAvatarURLToText(ctx context.Context, x base.EngineMigration) error { dbType := x.Dialect().URI().DBType if dbType == schemas.SQLITE { // For SQLITE, varchar or char will always be represented as TEXT return nil } // Some oauth2 providers may give very long avatar urls (i.e. Google) - return base.ModifyColumn(x, "external_login_user", &schemas.Column{ + return base.ModifyColumn(ctx, x, "external_login_user", &schemas.Column{ Name: "avatar_url", SQLType: schemas.SQLType{ Name: schemas.Text, diff --git a/modelmigration/v1_15/v180.go b/modelmigration/v1_15/v180.go index 42e81299a95..fd62b12c156 100644 --- a/modelmigration/v1_15/v180.go +++ b/modelmigration/v1_15/v180.go @@ -4,6 +4,8 @@ package v1_15 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/json" "gitea.dev/modules/util" @@ -11,7 +13,7 @@ import ( "xorm.io/builder" ) -func DeleteMigrationCredentials(x base.EngineMigration) (err error) { +func DeleteMigrationCredentials(_ context.Context, x base.EngineMigration) (err error) { // Task represents a task type Task struct { ID int64 diff --git a/modelmigration/v1_15/v181.go b/modelmigration/v1_15/v181.go index 3545e576f47..e825b7a7ec1 100644 --- a/modelmigration/v1_15/v181.go +++ b/modelmigration/v1_15/v181.go @@ -4,12 +4,13 @@ package v1_15 import ( + "context" "strings" "gitea.dev/modelmigration/base" ) -func AddPrimaryEmail2EmailAddress(x base.EngineMigration) error { +func AddPrimaryEmail2EmailAddress(_ context.Context, x base.EngineMigration) error { type User struct { ID int64 `xorm:"pk autoincr"` Email string `xorm:"NOT NULL"` diff --git a/modelmigration/v1_15/v181_test.go b/modelmigration/v1_15/v181_test.go index bc385bb78a9..e2d7e0e8b2b 100644 --- a/modelmigration/v1_15/v181_test.go +++ b/modelmigration/v1_15/v181_test.go @@ -27,7 +27,7 @@ func Test_AddPrimaryEmail2EmailAddress(t *testing.T) { } defer deferable() - err := AddPrimaryEmail2EmailAddress(x) + err := AddPrimaryEmail2EmailAddress(t.Context(), x) assert.NoError(t, err) type EmailAddress struct { diff --git a/modelmigration/v1_15/v182.go b/modelmigration/v1_15/v182.go index 8b0f7740d92..9574f6e6dbc 100644 --- a/modelmigration/v1_15/v182.go +++ b/modelmigration/v1_15/v182.go @@ -3,9 +3,13 @@ package v1_15 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddIssueResourceIndexTable(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddIssueResourceIndexTable(_ context.Context, x base.EngineMigration) error { type ResourceIndex struct { GroupID int64 `xorm:"pk"` MaxIndex int64 `xorm:"index"` diff --git a/modelmigration/v1_15/v182_test.go b/modelmigration/v1_15/v182_test.go index 2aa58f286f6..1de06ed338f 100644 --- a/modelmigration/v1_15/v182_test.go +++ b/modelmigration/v1_15/v182_test.go @@ -28,7 +28,7 @@ func Test_AddIssueResourceIndexTable(t *testing.T) { defer deferable() // Run the migration - if err := AddIssueResourceIndexTable(x); err != nil { + if err := AddIssueResourceIndexTable(t.Context(), x); err != nil { assert.NoError(t, err) return } diff --git a/modelmigration/v1_15/v183.go b/modelmigration/v1_15/v183.go index ae003c08b98..67e4c4bf58d 100644 --- a/modelmigration/v1_15/v183.go +++ b/modelmigration/v1_15/v183.go @@ -4,6 +4,7 @@ package v1_15 import ( + "context" "fmt" "time" @@ -11,7 +12,7 @@ import ( "gitea.dev/modules/timeutil" ) -func CreatePushMirrorTable(x base.EngineMigration) error { +func CreatePushMirrorTable(_ context.Context, x base.EngineMigration) error { type PushMirror struct { ID int64 `xorm:"pk autoincr"` RepoID int64 `xorm:"INDEX"` diff --git a/modelmigration/v1_15/v184.go b/modelmigration/v1_15/v184.go index 00d9375a660..e774da59229 100644 --- a/modelmigration/v1_15/v184.go +++ b/modelmigration/v1_15/v184.go @@ -11,7 +11,7 @@ import ( "gitea.dev/modules/setting" ) -func RenameTaskErrorsToMessage(x base.EngineMigration) error { +func RenameTaskErrorsToMessage(ctx context.Context, x base.EngineMigration) error { type Task struct { Errors string `xorm:"TEXT"` // if task failed, saved the error reason Type int @@ -19,13 +19,13 @@ func RenameTaskErrorsToMessage(x base.EngineMigration) error { } // This migration maybe rerun so that we should check if it has been run - messageExist, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "task", "message") + messageExist, err := x.Dialect().IsColumnExist(x.DB(), ctx, "task", "message") if err != nil { return err } if messageExist { - errorsExist, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "task", "errors") + errorsExist, err := x.Dialect().IsColumnExist(x.DB(), ctx, "task", "errors") if err != nil { return err } diff --git a/modelmigration/v1_15/v185.go b/modelmigration/v1_15/v185.go index 51670731f02..71fc4f78012 100644 --- a/modelmigration/v1_15/v185.go +++ b/modelmigration/v1_15/v185.go @@ -3,9 +3,13 @@ package v1_15 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddRepoArchiver(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddRepoArchiver(_ context.Context, x base.EngineMigration) error { // RepoArchiver represents all archivers type RepoArchiver struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_15/v186.go b/modelmigration/v1_15/v186.go index ea378ab61a3..c1d2cd60e63 100644 --- a/modelmigration/v1_15/v186.go +++ b/modelmigration/v1_15/v186.go @@ -4,11 +4,13 @@ package v1_15 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func CreateProtectedTagTable(x base.EngineMigration) error { +func CreateProtectedTagTable(_ context.Context, x base.EngineMigration) error { type ProtectedTag struct { ID int64 `xorm:"pk autoincr"` RepoID int64 diff --git a/modelmigration/v1_15/v187.go b/modelmigration/v1_15/v187.go index de58978f99d..56c97f113fd 100644 --- a/modelmigration/v1_15/v187.go +++ b/modelmigration/v1_15/v187.go @@ -4,10 +4,12 @@ package v1_15 import ( + "context" + "gitea.dev/modelmigration/base" ) -func DropWebhookColumns(x base.EngineMigration) error { +func DropWebhookColumns(_ context.Context, x base.EngineMigration) error { // Make sure the columns exist before dropping them type Webhook struct { Signature string `xorm:"TEXT"` diff --git a/modelmigration/v1_15/v188.go b/modelmigration/v1_15/v188.go index e33d55df41f..ce6754e66c2 100644 --- a/modelmigration/v1_15/v188.go +++ b/modelmigration/v1_15/v188.go @@ -3,9 +3,13 @@ package v1_15 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddKeyIsVerified(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddKeyIsVerified(_ context.Context, x base.EngineMigration) error { type GPGKey struct { Verified bool `xorm:"NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_16/v189.go b/modelmigration/v1_16/v189.go index e88abf69404..f5d1e90c5e1 100644 --- a/modelmigration/v1_16/v189.go +++ b/modelmigration/v1_16/v189.go @@ -4,6 +4,7 @@ package v1_16 import ( + "context" "encoding/binary" "fmt" @@ -11,7 +12,7 @@ import ( "gitea.dev/modules/json" ) -func UnwrapLDAPSourceCfg(x base.EngineMigration) error { +func UnwrapLDAPSourceCfg(_ context.Context, x base.EngineMigration) error { jsonUnmarshalHandleDoubleEncode := func(bs []byte, v any) error { err := json.Unmarshal(bs, v) if err != nil { diff --git a/modelmigration/v1_16/v189_test.go b/modelmigration/v1_16/v189_test.go index 549509e8b13..09de4af4220 100644 --- a/modelmigration/v1_16/v189_test.go +++ b/modelmigration/v1_16/v189_test.go @@ -44,7 +44,7 @@ func Test_UnwrapLDAPSourceCfg(t *testing.T) { } // Run the migration - if err := UnwrapLDAPSourceCfg(x); err != nil { + if err := UnwrapLDAPSourceCfg(t.Context(), x); err != nil { assert.NoError(t, err) return } diff --git a/modelmigration/v1_16/v190.go b/modelmigration/v1_16/v190.go index 1d6d479b18f..d3438f5cd89 100644 --- a/modelmigration/v1_16/v190.go +++ b/modelmigration/v1_16/v190.go @@ -4,12 +4,13 @@ package v1_16 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddAgitFlowPullRequest(x base.EngineMigration) error { +func AddAgitFlowPullRequest(_ context.Context, x base.EngineMigration) error { type PullRequestFlow int type PullRequest struct { diff --git a/modelmigration/v1_16/v191.go b/modelmigration/v1_16/v191.go index f5637521676..b44dbcb6c63 100644 --- a/modelmigration/v1_16/v191.go +++ b/modelmigration/v1_16/v191.go @@ -4,11 +4,13 @@ package v1_16 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/setting" ) -func AlterIssueAndCommentTextFieldsToLongText(x base.EngineMigration) error { +func AlterIssueAndCommentTextFieldsToLongText(_ context.Context, x base.EngineMigration) error { sess := x.NewSession() defer sess.Close() if err := sess.Begin(); err != nil { diff --git a/modelmigration/v1_16/v192.go b/modelmigration/v1_16/v192.go index 9071566ca4d..491b4cae1fb 100644 --- a/modelmigration/v1_16/v192.go +++ b/modelmigration/v1_16/v192.go @@ -4,10 +4,12 @@ package v1_16 import ( + "context" + "gitea.dev/modelmigration/base" ) -func RecreateIssueResourceIndexTable(x base.EngineMigration) error { +func RecreateIssueResourceIndexTable(_ context.Context, x base.EngineMigration) error { type IssueIndex struct { GroupID int64 `xorm:"pk"` MaxIndex int64 `xorm:"index"` diff --git a/modelmigration/v1_16/v193.go b/modelmigration/v1_16/v193.go index 5d18c85729b..37a6ef3fe4e 100644 --- a/modelmigration/v1_16/v193.go +++ b/modelmigration/v1_16/v193.go @@ -3,9 +3,13 @@ package v1_16 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddRepoIDForAttachment(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddRepoIDForAttachment(_ context.Context, x base.EngineMigration) error { type Attachment struct { ID int64 `xorm:"pk autoincr"` UUID string `xorm:"uuid UNIQUE"` diff --git a/modelmigration/v1_16/v193_test.go b/modelmigration/v1_16/v193_test.go index 38ce2632056..bdca2629b8d 100644 --- a/modelmigration/v1_16/v193_test.go +++ b/modelmigration/v1_16/v193_test.go @@ -38,7 +38,7 @@ func Test_AddRepoIDForAttachment(t *testing.T) { } // Run the migration - if err := AddRepoIDForAttachment(x); err != nil { + if err := AddRepoIDForAttachment(t.Context(), x); err != nil { assert.NoError(t, err) return } diff --git a/modelmigration/v1_16/v194.go b/modelmigration/v1_16/v194.go index 22a175ea767..931d8bb0513 100644 --- a/modelmigration/v1_16/v194.go +++ b/modelmigration/v1_16/v194.go @@ -4,12 +4,13 @@ package v1_16 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddBranchProtectionUnprotectedFilesColumn(x base.EngineMigration) error { +func AddBranchProtectionUnprotectedFilesColumn(_ context.Context, x base.EngineMigration) error { type ProtectedBranch struct { UnprotectedFilePatterns string `xorm:"TEXT"` } diff --git a/modelmigration/v1_16/v195.go b/modelmigration/v1_16/v195.go index e6d0890a892..23bd8ac8bfe 100644 --- a/modelmigration/v1_16/v195.go +++ b/modelmigration/v1_16/v195.go @@ -4,12 +4,13 @@ package v1_16 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddTableCommitStatusIndex(x base.EngineMigration) error { +func AddTableCommitStatusIndex(_ context.Context, x base.EngineMigration) error { // CommitStatusIndex represents a table for commit status index type CommitStatusIndex struct { ID int64 diff --git a/modelmigration/v1_16/v195_test.go b/modelmigration/v1_16/v195_test.go index b1202d94a4a..eaccdecee68 100644 --- a/modelmigration/v1_16/v195_test.go +++ b/modelmigration/v1_16/v195_test.go @@ -29,7 +29,7 @@ func Test_AddTableCommitStatusIndex(t *testing.T) { defer deferable() // Run the migration - if err := AddTableCommitStatusIndex(x); err != nil { + if err := AddTableCommitStatusIndex(t.Context(), x); err != nil { assert.NoError(t, err) return } diff --git a/modelmigration/v1_16/v196.go b/modelmigration/v1_16/v196.go index a3fdf3820fe..299a2ef0008 100644 --- a/modelmigration/v1_16/v196.go +++ b/modelmigration/v1_16/v196.go @@ -4,12 +4,13 @@ package v1_16 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddColorColToProjectBoard(x base.EngineMigration) error { +func AddColorColToProjectBoard(_ context.Context, x base.EngineMigration) error { type ProjectBoard struct { Color string `xorm:"VARCHAR(7)"` } diff --git a/modelmigration/v1_16/v197.go b/modelmigration/v1_16/v197.go index eaa9c9e51dd..ae7241b8792 100644 --- a/modelmigration/v1_16/v197.go +++ b/modelmigration/v1_16/v197.go @@ -3,9 +3,13 @@ package v1_16 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddRenamedBranchTable(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddRenamedBranchTable(_ context.Context, x base.EngineMigration) error { type RenamedBranch struct { ID int64 `xorm:"pk autoincr"` RepoID int64 `xorm:"INDEX NOT NULL"` diff --git a/modelmigration/v1_16/v198.go b/modelmigration/v1_16/v198.go index f5682674298..80407f4d846 100644 --- a/modelmigration/v1_16/v198.go +++ b/modelmigration/v1_16/v198.go @@ -4,13 +4,14 @@ package v1_16 import ( + "context" "fmt" "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddTableIssueContentHistory(x base.EngineMigration) error { +func AddTableIssueContentHistory(_ context.Context, x base.EngineMigration) error { type IssueContentHistory struct { ID int64 `xorm:"pk autoincr"` PosterID int64 diff --git a/modelmigration/v1_16/v200.go b/modelmigration/v1_16/v200.go index efb99840ac8..b4de56d70e4 100644 --- a/modelmigration/v1_16/v200.go +++ b/modelmigration/v1_16/v200.go @@ -4,12 +4,13 @@ package v1_16 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddTableAppState(x base.EngineMigration) error { +func AddTableAppState(_ context.Context, x base.EngineMigration) error { type AppState struct { ID string `xorm:"pk varchar(200)"` Revision int64 diff --git a/modelmigration/v1_16/v201.go b/modelmigration/v1_16/v201.go index fc385c96bbf..3ffdd87ab22 100644 --- a/modelmigration/v1_16/v201.go +++ b/modelmigration/v1_16/v201.go @@ -3,9 +3,13 @@ package v1_16 -import "gitea.dev/modelmigration/base" +import ( + "context" -func DropTableRemoteVersion(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func DropTableRemoteVersion(_ context.Context, x base.EngineMigration) error { // drop the orphaned table introduced in `v199`, now the update checker also uses AppState, do not need this table _ = x.DropTables("remote_version") return nil diff --git a/modelmigration/v1_16/v202.go b/modelmigration/v1_16/v202.go index 74775054451..c529573e9fe 100644 --- a/modelmigration/v1_16/v202.go +++ b/modelmigration/v1_16/v202.go @@ -4,12 +4,13 @@ package v1_16 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func CreateUserSettingsTable(x base.EngineMigration) error { +func CreateUserSettingsTable(_ context.Context, x base.EngineMigration) error { type UserSetting struct { ID int64 `xorm:"pk autoincr"` UserID int64 `xorm:"index unique(key_userid)"` // to load all of someone's settings diff --git a/modelmigration/v1_16/v203.go b/modelmigration/v1_16/v203.go index d73df2043c6..990a1173aca 100644 --- a/modelmigration/v1_16/v203.go +++ b/modelmigration/v1_16/v203.go @@ -3,9 +3,13 @@ package v1_16 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddProjectIssueSorting(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddProjectIssueSorting(_ context.Context, x base.EngineMigration) error { // ProjectIssue saves relation from issue to a project type ProjectIssue struct { Sorting int64 `xorm:"NOT NULL DEFAULT 0"` diff --git a/modelmigration/v1_16/v204.go b/modelmigration/v1_16/v204.go index 2aaaca4b566..ea3a8e8d109 100644 --- a/modelmigration/v1_16/v204.go +++ b/modelmigration/v1_16/v204.go @@ -3,9 +3,13 @@ package v1_16 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddSSHKeyIsVerified(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddSSHKeyIsVerified(_ context.Context, x base.EngineMigration) error { type PublicKey struct { Verified bool `xorm:"NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_16/v205.go b/modelmigration/v1_16/v205.go index 0607c5f91bd..227bcb4576a 100644 --- a/modelmigration/v1_16/v205.go +++ b/modelmigration/v1_16/v205.go @@ -4,19 +4,21 @@ package v1_16 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm/schemas" ) -func MigrateUserPasswordSalt(x base.EngineMigration) error { +func MigrateUserPasswordSalt(ctx context.Context, x base.EngineMigration) error { dbType := x.Dialect().URI().DBType // For SQLITE, the max length doesn't matter. if dbType == schemas.SQLITE { return nil } - if err := base.ModifyColumn(x, "user", &schemas.Column{ + if err := base.ModifyColumn(ctx, x, "user", &schemas.Column{ Name: "rands", SQLType: schemas.SQLType{ Name: "VARCHAR", @@ -29,7 +31,7 @@ func MigrateUserPasswordSalt(x base.EngineMigration) error { return err } - return base.ModifyColumn(x, "user", &schemas.Column{ + return base.ModifyColumn(ctx, x, "user", &schemas.Column{ Name: "salt", SQLType: schemas.SQLType{ Name: "VARCHAR", diff --git a/modelmigration/v1_16/v206.go b/modelmigration/v1_16/v206.go index 947d40eda6f..849418ff63d 100644 --- a/modelmigration/v1_16/v206.go +++ b/modelmigration/v1_16/v206.go @@ -4,12 +4,13 @@ package v1_16 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func AddAuthorizeColForTeamUnit(x base.EngineMigration) error { +func AddAuthorizeColForTeamUnit(_ context.Context, x base.EngineMigration) error { type TeamUnit struct { ID int64 `xorm:"pk autoincr"` OrgID int64 `xorm:"INDEX"` diff --git a/modelmigration/v1_16/v207.go b/modelmigration/v1_16/v207.go index 40e9dadd232..3ec9df0c066 100644 --- a/modelmigration/v1_16/v207.go +++ b/modelmigration/v1_16/v207.go @@ -3,9 +3,13 @@ package v1_16 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddWebAuthnCred(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddWebAuthnCred(_ context.Context, x base.EngineMigration) error { // NO-OP Don't migrate here - let v210 do this. return nil diff --git a/modelmigration/v1_16/v208.go b/modelmigration/v1_16/v208.go index edbeae99cb8..1fb34e74489 100644 --- a/modelmigration/v1_16/v208.go +++ b/modelmigration/v1_16/v208.go @@ -3,9 +3,13 @@ package v1_16 -import "gitea.dev/modelmigration/base" +import ( + "context" -func UseBase32HexForCredIDInWebAuthnCredential(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func UseBase32HexForCredIDInWebAuthnCredential(_ context.Context, x base.EngineMigration) error { // noop return nil } diff --git a/modelmigration/v1_16/v209.go b/modelmigration/v1_16/v209.go index ea98f5b688e..ec822a31daf 100644 --- a/modelmigration/v1_16/v209.go +++ b/modelmigration/v1_16/v209.go @@ -3,9 +3,13 @@ package v1_16 -import "gitea.dev/modelmigration/base" +import ( + "context" -func IncreaseCredentialIDTo410(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func IncreaseCredentialIDTo410(_ context.Context, x base.EngineMigration) error { // no-op // v208 was completely wrong // So now we have to no-op again. diff --git a/modelmigration/v1_16/v210.go b/modelmigration/v1_16/v210.go index 924df3827ce..2ed6732507c 100644 --- a/modelmigration/v1_16/v210.go +++ b/modelmigration/v1_16/v210.go @@ -4,6 +4,7 @@ package v1_16 import ( + "context" "encoding/base32" "fmt" "strings" @@ -16,7 +17,7 @@ import ( ) // v208 migration was completely broken -func RemigrateU2FCredentials(x base.EngineMigration) error { +func RemigrateU2FCredentials(_ context.Context, x base.EngineMigration) error { // Create webauthnCredential table type webauthnCredential struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_16/v210_test.go b/modelmigration/v1_16/v210_test.go index 6a7b32c8c17..ef7d985b6bf 100644 --- a/modelmigration/v1_16/v210_test.go +++ b/modelmigration/v1_16/v210_test.go @@ -56,7 +56,7 @@ func Test_RemigrateU2FCredentials(t *testing.T) { } // Run the migration - if err := RemigrateU2FCredentials(x); err != nil { + if err := RemigrateU2FCredentials(t.Context(), x); err != nil { assert.NoError(t, err) return } diff --git a/modelmigration/v1_17/v211.go b/modelmigration/v1_17/v211.go index 1fcf97503eb..690a2efc6dc 100644 --- a/modelmigration/v1_17/v211.go +++ b/modelmigration/v1_17/v211.go @@ -3,8 +3,12 @@ package v1_17 -import "gitea.dev/modelmigration/base" +import ( + "context" -func CreateForeignReferenceTable(_ base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func CreateForeignReferenceTable(_ context.Context, _ base.EngineMigration) error { return nil // This table was dropped in v1_19/v237.go } diff --git a/modelmigration/v1_17/v212.go b/modelmigration/v1_17/v212.go index 3fd849f921e..3a63db7061d 100644 --- a/modelmigration/v1_17/v212.go +++ b/modelmigration/v1_17/v212.go @@ -4,11 +4,13 @@ package v1_17 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddPackageTables(x base.EngineMigration) error { +func AddPackageTables(_ context.Context, x base.EngineMigration) error { type Package struct { ID int64 `xorm:"pk autoincr"` OwnerID int64 `xorm:"UNIQUE(s) INDEX NOT NULL"` diff --git a/modelmigration/v1_17/v213.go b/modelmigration/v1_17/v213.go index 2859aec2927..239741f0d90 100644 --- a/modelmigration/v1_17/v213.go +++ b/modelmigration/v1_17/v213.go @@ -3,9 +3,13 @@ package v1_17 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddAllowMaintainerEdit(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddAllowMaintainerEdit(_ context.Context, x base.EngineMigration) error { // PullRequest represents relation between pull request and repositories. type PullRequest struct { AllowMaintainerEdit bool `xorm:"NOT NULL DEFAULT false"` diff --git a/modelmigration/v1_17/v214.go b/modelmigration/v1_17/v214.go index 2ab1fe4cea1..f862ef9bc46 100644 --- a/modelmigration/v1_17/v214.go +++ b/modelmigration/v1_17/v214.go @@ -3,9 +3,13 @@ package v1_17 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddAutoMergeTable(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddAutoMergeTable(_ context.Context, x base.EngineMigration) error { type MergeStyle string type PullAutoMerge struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_17/v215.go b/modelmigration/v1_17/v215.go index f376b0e1a72..928f031e534 100644 --- a/modelmigration/v1_17/v215.go +++ b/modelmigration/v1_17/v215.go @@ -4,11 +4,13 @@ package v1_17 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddReviewViewedFiles(x base.EngineMigration) error { +func AddReviewViewedFiles(_ context.Context, x base.EngineMigration) error { type ReviewState struct { ID int64 `xorm:"pk autoincr"` UserID int64 `xorm:"NOT NULL UNIQUE(pull_commit_user)"` diff --git a/modelmigration/v1_17/v217.go b/modelmigration/v1_17/v217.go index a3580676764..1b4be43d3a2 100644 --- a/modelmigration/v1_17/v217.go +++ b/modelmigration/v1_17/v217.go @@ -4,11 +4,13 @@ package v1_17 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/setting" ) -func AlterHookTaskTextFieldsToLongText(x base.EngineMigration) error { +func AlterHookTaskTextFieldsToLongText(_ context.Context, x base.EngineMigration) error { sess := x.NewSession() defer sess.Close() if err := sess.Begin(); err != nil { diff --git a/modelmigration/v1_17/v218.go b/modelmigration/v1_17/v218.go index 04e01b2bad5..cbb161a3d2c 100644 --- a/modelmigration/v1_17/v218.go +++ b/modelmigration/v1_17/v218.go @@ -4,6 +4,8 @@ package v1_17 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/setting" "gitea.dev/modules/timeutil" @@ -47,6 +49,6 @@ func (*improveActionTableIndicesAction) TableIndices() []*schemas.Index { return indices } -func ImproveActionTableIndices(x base.EngineMigration) error { +func ImproveActionTableIndices(_ context.Context, x base.EngineMigration) error { return x.Sync(&improveActionTableIndicesAction{}) } diff --git a/modelmigration/v1_17/v219.go b/modelmigration/v1_17/v219.go index 0c7a783c739..b73dee5c4e1 100644 --- a/modelmigration/v1_17/v219.go +++ b/modelmigration/v1_17/v219.go @@ -4,13 +4,14 @@ package v1_17 import ( + "context" "time" "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddSyncOnCommitColForPushMirror(x base.EngineMigration) error { +func AddSyncOnCommitColForPushMirror(_ context.Context, x base.EngineMigration) error { type PushMirror struct { ID int64 `xorm:"pk autoincr"` RepoID int64 `xorm:"INDEX"` diff --git a/modelmigration/v1_17/v220.go b/modelmigration/v1_17/v220.go index c02fd8d3154..71b1826865b 100644 --- a/modelmigration/v1_17/v220.go +++ b/modelmigration/v1_17/v220.go @@ -4,6 +4,8 @@ package v1_17 import ( + "context" + "gitea.dev/modelmigration/base" packages_model "gitea.dev/models/packages" //nolint:depguard // only consts are used container_module "gitea.dev/modules/packages/container" @@ -11,7 +13,7 @@ import ( "xorm.io/xorm/schemas" ) -func AddContainerRepositoryProperty(x base.EngineMigration) (err error) { +func AddContainerRepositoryProperty(_ context.Context, x base.EngineMigration) (err error) { switch x.Dialect().URI().DBType { case schemas.SQLITE: _, err = x.Exec("INSERT INTO package_property (ref_type, ref_id, name, value) SELECT ?, p.id, ?, u.lower_name || '/' || p.lower_name FROM package p JOIN `user` u ON p.owner_id = u.id WHERE p.type = ?", diff --git a/modelmigration/v1_17/v221.go b/modelmigration/v1_17/v221.go index 775eb081a42..64271108cb5 100644 --- a/modelmigration/v1_17/v221.go +++ b/modelmigration/v1_17/v221.go @@ -4,6 +4,7 @@ package v1_17 import ( + "context" "encoding/base32" "fmt" @@ -11,7 +12,7 @@ import ( "gitea.dev/modules/timeutil" ) -func StoreWebauthnCredentialIDAsBytes(x base.EngineMigration) error { +func StoreWebauthnCredentialIDAsBytes(_ context.Context, x base.EngineMigration) error { // Create webauthnCredential table type webauthnCredential struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_17/v221_test.go b/modelmigration/v1_17/v221_test.go index f6c8e37590f..fd7734865e0 100644 --- a/modelmigration/v1_17/v221_test.go +++ b/modelmigration/v1_17/v221_test.go @@ -44,7 +44,7 @@ func Test_StoreWebauthnCredentialIDAsBytes(t *testing.T) { return } - if err := StoreWebauthnCredentialIDAsBytes(x); err != nil { + if err := StoreWebauthnCredentialIDAsBytes(t.Context(), x); err != nil { assert.NoError(t, err) return } diff --git a/modelmigration/v1_17/v222.go b/modelmigration/v1_17/v222.go index b223b74ee0a..0c65de71270 100644 --- a/modelmigration/v1_17/v222.go +++ b/modelmigration/v1_17/v222.go @@ -12,9 +12,9 @@ import ( "gitea.dev/modules/timeutil" ) -func DropOldCredentialIDColumn(x base.EngineMigration) error { +func DropOldCredentialIDColumn(ctx context.Context, x base.EngineMigration) error { // This migration maybe rerun so that we should check if it has been run - credentialIDExist, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "webauthn_credential", "credential_id") + credentialIDExist, err := x.Dialect().IsColumnExist(x.DB(), ctx, "webauthn_credential", "credential_id") if err != nil { return err } @@ -22,7 +22,7 @@ func DropOldCredentialIDColumn(x base.EngineMigration) error { // Column is already non-extant return nil } - credentialIDBytesExists, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "webauthn_credential", "credential_id_bytes") + credentialIDBytesExists, err := x.Dialect().IsColumnExist(x.DB(), ctx, "webauthn_credential", "credential_id_bytes") if err != nil { return err } diff --git a/modelmigration/v1_17/v223.go b/modelmigration/v1_17/v223.go index c4e6d07aa41..066c7af307a 100644 --- a/modelmigration/v1_17/v223.go +++ b/modelmigration/v1_17/v223.go @@ -12,14 +12,14 @@ import ( "gitea.dev/modules/timeutil" ) -func RenameCredentialIDBytes(x base.EngineMigration) error { +func RenameCredentialIDBytes(ctx context.Context, x base.EngineMigration) error { // This migration maybe rerun so that we should check if it has been run - credentialIDExist, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "webauthn_credential", "credential_id") + credentialIDExist, err := x.Dialect().IsColumnExist(x.DB(), ctx, "webauthn_credential", "credential_id") if err != nil { return err } if credentialIDExist { - credentialIDBytesExists, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "webauthn_credential", "credential_id_bytes") + credentialIDBytesExists, err := x.Dialect().IsColumnExist(x.DB(), ctx, "webauthn_credential", "credential_id_bytes") if err != nil { return err } diff --git a/modelmigration/v1_18/v224.go b/modelmigration/v1_18/v224.go index 37f8551a193..055ba399969 100644 --- a/modelmigration/v1_18/v224.go +++ b/modelmigration/v1_18/v224.go @@ -3,9 +3,13 @@ package v1_18 -import "gitea.dev/modelmigration/base" +import ( + "context" -func CreateUserBadgesTable(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func CreateUserBadgesTable(_ context.Context, x base.EngineMigration) error { type Badge struct { ID int64 `xorm:"pk autoincr"` Description string diff --git a/modelmigration/v1_18/v225.go b/modelmigration/v1_18/v225.go index af800a65b07..17b659865cc 100644 --- a/modelmigration/v1_18/v225.go +++ b/modelmigration/v1_18/v225.go @@ -4,11 +4,13 @@ package v1_18 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/setting" ) -func AlterPublicGPGKeyContentFieldsToMediumText(x base.EngineMigration) error { +func AlterPublicGPGKeyContentFieldsToMediumText(_ context.Context, x base.EngineMigration) error { sess := x.NewSession() defer sess.Close() if err := sess.Begin(); err != nil { diff --git a/modelmigration/v1_18/v226.go b/modelmigration/v1_18/v226.go index edce2af067b..089fef0bec0 100644 --- a/modelmigration/v1_18/v226.go +++ b/modelmigration/v1_18/v226.go @@ -4,12 +4,14 @@ package v1_18 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/builder" ) -func FixPackageSemverField(x base.EngineMigration) error { +func FixPackageSemverField(_ context.Context, x base.EngineMigration) error { _, err := x.Exec(builder.Update(builder.Eq{"semver_compatible": false}).From("`package`").Where(builder.In("`type`", "conan", "generic"))) return err } diff --git a/modelmigration/v1_18/v227.go b/modelmigration/v1_18/v227.go index 8f1f6bcbdac..100e062729b 100644 --- a/modelmigration/v1_18/v227.go +++ b/modelmigration/v1_18/v227.go @@ -4,6 +4,8 @@ package v1_18 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) @@ -17,6 +19,6 @@ type SystemSetting struct { Updated timeutil.TimeStamp `xorm:"updated"` } -func CreateSystemSettingsTable(x base.EngineMigration) error { +func CreateSystemSettingsTable(_ context.Context, x base.EngineMigration) error { return x.Sync(new(SystemSetting)) } diff --git a/modelmigration/v1_18/v228.go b/modelmigration/v1_18/v228.go index 5becd95dc33..e3869611871 100644 --- a/modelmigration/v1_18/v228.go +++ b/modelmigration/v1_18/v228.go @@ -4,11 +4,13 @@ package v1_18 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddTeamInviteTable(x base.EngineMigration) error { +func AddTeamInviteTable(_ context.Context, x base.EngineMigration) error { type TeamInvite struct { ID int64 `xorm:"pk autoincr"` Token string `xorm:"UNIQUE(token) INDEX NOT NULL DEFAULT ''"` diff --git a/modelmigration/v1_18/v229.go b/modelmigration/v1_18/v229.go index 9b4ef19a558..d9388237c89 100644 --- a/modelmigration/v1_18/v229.go +++ b/modelmigration/v1_18/v229.go @@ -4,6 +4,7 @@ package v1_18 import ( + "context" "fmt" "gitea.dev/modelmigration/base" @@ -12,7 +13,7 @@ import ( "xorm.io/builder" ) -func UpdateOpenMilestoneCounts(x base.EngineMigration) error { +func UpdateOpenMilestoneCounts(_ context.Context, x base.EngineMigration) error { var openMilestoneIDs []int64 err := x.Table("milestone").Select("id").Where(builder.Neq{"is_closed": 1}).Find(&openMilestoneIDs) if err != nil { diff --git a/modelmigration/v1_18/v229_test.go b/modelmigration/v1_18/v229_test.go index 7fd76292ac0..a597be20ce5 100644 --- a/modelmigration/v1_18/v229_test.go +++ b/modelmigration/v1_18/v229_test.go @@ -40,7 +40,7 @@ func Test_UpdateOpenMilestoneCounts(t *testing.T) { return } - if err := UpdateOpenMilestoneCounts(x); err != nil { + if err := UpdateOpenMilestoneCounts(t.Context(), x); err != nil { assert.NoError(t, err) return } diff --git a/modelmigration/v1_18/v230.go b/modelmigration/v1_18/v230.go index 00696bf4681..a5ea879d142 100644 --- a/modelmigration/v1_18/v230.go +++ b/modelmigration/v1_18/v230.go @@ -3,10 +3,14 @@ package v1_18 -import "gitea.dev/modelmigration/base" +import ( + "context" + + "gitea.dev/modelmigration/base" +) // AddConfidentialColumnToOAuth2ApplicationTable: add ConfidentialClient column, setting existing rows to true -func AddConfidentialClientColumnToOAuth2ApplicationTable(x base.EngineMigration) error { +func AddConfidentialClientColumnToOAuth2ApplicationTable(_ context.Context, x base.EngineMigration) error { type oauth2Application struct { ID int64 ConfidentialClient bool `xorm:"NOT NULL DEFAULT TRUE"` diff --git a/modelmigration/v1_18/v230_test.go b/modelmigration/v1_18/v230_test.go index 3c0d9f746a6..d96cf162abe 100644 --- a/modelmigration/v1_18/v230_test.go +++ b/modelmigration/v1_18/v230_test.go @@ -24,7 +24,7 @@ func Test_AddConfidentialClientColumnToOAuth2ApplicationTable(t *testing.T) { return } - if err := AddConfidentialClientColumnToOAuth2ApplicationTable(x); err != nil { + if err := AddConfidentialClientColumnToOAuth2ApplicationTable(t.Context(), x); err != nil { assert.NoError(t, err) return } diff --git a/modelmigration/v1_19/v231.go b/modelmigration/v1_19/v231.go index 25c1ddcaaaf..a6c6c75e0b9 100644 --- a/modelmigration/v1_19/v231.go +++ b/modelmigration/v1_19/v231.go @@ -3,9 +3,13 @@ package v1_19 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddIndexForHookTask(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddIndexForHookTask(_ context.Context, x base.EngineMigration) error { type HookTask struct { ID int64 `xorm:"pk autoincr"` HookID int64 `xorm:"index"` diff --git a/modelmigration/v1_19/v232.go b/modelmigration/v1_19/v232.go index 58c72b9bc2b..fc6fce254fa 100644 --- a/modelmigration/v1_19/v232.go +++ b/modelmigration/v1_19/v232.go @@ -4,11 +4,13 @@ package v1_19 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/setting" ) -func AlterPackageVersionMetadataToLongText(x base.EngineMigration) error { +func AlterPackageVersionMetadataToLongText(_ context.Context, x base.EngineMigration) error { sess := x.NewSession() defer sess.Close() if err := sess.Begin(); err != nil { diff --git a/modelmigration/v1_19/v233.go b/modelmigration/v1_19/v233.go index 9603266dd4c..30f01b5d250 100644 --- a/modelmigration/v1_19/v233.go +++ b/modelmigration/v1_19/v233.go @@ -4,6 +4,7 @@ package v1_19 import ( + "context" "fmt" "gitea.dev/modelmigration/base" @@ -51,7 +52,7 @@ func batchProcess[T any](x base.EngineMigration, buf []T, query func(limit, star } } -func AddHeaderAuthorizationEncryptedColWebhook(x base.EngineMigration) error { +func AddHeaderAuthorizationEncryptedColWebhook(_ context.Context, x base.EngineMigration) error { // Add the column to the table type Webhook struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_19/v233_test.go b/modelmigration/v1_19/v233_test.go index 3161e9c4d0c..ed4abd8fda1 100644 --- a/modelmigration/v1_19/v233_test.go +++ b/modelmigration/v1_19/v233_test.go @@ -45,7 +45,7 @@ func Test_AddHeaderAuthorizationEncryptedColWebhook(t *testing.T) { return } - if err := AddHeaderAuthorizationEncryptedColWebhook(x); err != nil { + if err := AddHeaderAuthorizationEncryptedColWebhook(t.Context(), x); err != nil { assert.NoError(t, err) return } diff --git a/modelmigration/v1_19/v234.go b/modelmigration/v1_19/v234.go index 23fc66d5882..c96ce513e18 100644 --- a/modelmigration/v1_19/v234.go +++ b/modelmigration/v1_19/v234.go @@ -4,11 +4,13 @@ package v1_19 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func CreatePackageCleanupRuleTable(x base.EngineMigration) error { +func CreatePackageCleanupRuleTable(_ context.Context, x base.EngineMigration) error { type PackageCleanupRule struct { ID int64 `xorm:"pk autoincr"` Enabled bool `xorm:"INDEX NOT NULL DEFAULT false"` diff --git a/modelmigration/v1_19/v235.go b/modelmigration/v1_19/v235.go index 80464f27636..c598560d625 100644 --- a/modelmigration/v1_19/v235.go +++ b/modelmigration/v1_19/v235.go @@ -3,9 +3,13 @@ package v1_19 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddIndexForAccessToken(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddIndexForAccessToken(_ context.Context, x base.EngineMigration) error { type AccessToken struct { TokenLastEight string `xorm:"INDEX token_last_eight"` } diff --git a/modelmigration/v1_19/v236.go b/modelmigration/v1_19/v236.go index 5de0a684c6a..02014138dc4 100644 --- a/modelmigration/v1_19/v236.go +++ b/modelmigration/v1_19/v236.go @@ -4,11 +4,13 @@ package v1_19 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func CreateSecretsTable(x base.EngineMigration) error { +func CreateSecretsTable(_ context.Context, x base.EngineMigration) error { type Secret struct { ID int64 OwnerID int64 `xorm:"INDEX UNIQUE(owner_repo_name) NOT NULL"` diff --git a/modelmigration/v1_19/v237.go b/modelmigration/v1_19/v237.go index 89508cc69ff..44a3ce01505 100644 --- a/modelmigration/v1_19/v237.go +++ b/modelmigration/v1_19/v237.go @@ -3,9 +3,13 @@ package v1_19 -import "gitea.dev/modelmigration/base" +import ( + "context" -func DropForeignReferenceTable(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func DropForeignReferenceTable(_ context.Context, x base.EngineMigration) error { // Drop the table introduced in `v211`, it's considered badly designed and doesn't look like to be used. // See: https://github.com/go-gitea/gitea/issues/21086#issuecomment-1318217453 type ForeignReference struct{} diff --git a/modelmigration/v1_19/v238.go b/modelmigration/v1_19/v238.go index 0fc41c8595e..a3cbe78820b 100644 --- a/modelmigration/v1_19/v238.go +++ b/modelmigration/v1_19/v238.go @@ -4,12 +4,14 @@ package v1_19 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) // AddUpdatedUnixToLFSMetaObject adds an updated column to the LFSMetaObject to allow for garbage collection -func AddUpdatedUnixToLFSMetaObject(x base.EngineMigration) error { +func AddUpdatedUnixToLFSMetaObject(_ context.Context, x base.EngineMigration) error { // Drop the table introduced in `v211`, it's considered badly designed and doesn't look like to be used. // See: https://github.com/go-gitea/gitea/issues/21086#issuecomment-1318217453 // LFSMetaObject stores metadata for LFS tracked files. diff --git a/modelmigration/v1_19/v239.go b/modelmigration/v1_19/v239.go index cb1944548c5..055f1af97e4 100644 --- a/modelmigration/v1_19/v239.go +++ b/modelmigration/v1_19/v239.go @@ -3,9 +3,13 @@ package v1_19 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddScopeForAccessTokens(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddScopeForAccessTokens(_ context.Context, x base.EngineMigration) error { type AccessToken struct { Scope string } diff --git a/modelmigration/v1_19/v240.go b/modelmigration/v1_19/v240.go index 834e4479d90..cc7571c1b68 100644 --- a/modelmigration/v1_19/v240.go +++ b/modelmigration/v1_19/v240.go @@ -4,11 +4,13 @@ package v1_19 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddActionsTables(x base.EngineMigration) error { +func AddActionsTables(_ context.Context, x base.EngineMigration) error { type ActionRunner struct { ID int64 UUID string `xorm:"CHAR(36) UNIQUE"` diff --git a/modelmigration/v1_19/v241.go b/modelmigration/v1_19/v241.go index f70eb593fe5..6713e02f61d 100644 --- a/modelmigration/v1_19/v241.go +++ b/modelmigration/v1_19/v241.go @@ -3,10 +3,14 @@ package v1_19 -import "gitea.dev/modelmigration/base" +import ( + "context" + + "gitea.dev/modelmigration/base" +) // AddCardTypeToProjectTable: add CardType column, setting existing rows to CardTypeTextOnly -func AddCardTypeToProjectTable(x base.EngineMigration) error { +func AddCardTypeToProjectTable(_ context.Context, x base.EngineMigration) error { type Project struct { CardType int `xorm:"NOT NULL DEFAULT 0"` } diff --git a/modelmigration/v1_19/v242.go b/modelmigration/v1_19/v242.go index 17eccd8f39e..5860e0ad851 100644 --- a/modelmigration/v1_19/v242.go +++ b/modelmigration/v1_19/v242.go @@ -4,12 +4,14 @@ package v1_19 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/setting" ) // AlterPublicGPGKeyImportContentFieldToMediumText: set GPGKeyImport Content field to MEDIUMTEXT -func AlterPublicGPGKeyImportContentFieldToMediumText(x base.EngineMigration) error { +func AlterPublicGPGKeyImportContentFieldToMediumText(_ context.Context, x base.EngineMigration) error { sess := x.NewSession() defer sess.Close() if err := sess.Begin(); err != nil { diff --git a/modelmigration/v1_19/v243.go b/modelmigration/v1_19/v243.go index ab878d57f95..215f02263a3 100644 --- a/modelmigration/v1_19/v243.go +++ b/modelmigration/v1_19/v243.go @@ -3,9 +3,13 @@ package v1_19 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddExclusiveLabel(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddExclusiveLabel(_ context.Context, x base.EngineMigration) error { type Label struct { Exclusive bool } diff --git a/modelmigration/v1_20/v244.go b/modelmigration/v1_20/v244.go index 4820d400b1b..d9079c2f074 100644 --- a/modelmigration/v1_20/v244.go +++ b/modelmigration/v1_20/v244.go @@ -3,9 +3,13 @@ package v1_20 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddNeedApprovalToActionRun(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddNeedApprovalToActionRun(_ context.Context, x base.EngineMigration) error { /* New index: TriggerUserID New fields: NeedApproval, ApprovedBy diff --git a/modelmigration/v1_20/v245.go b/modelmigration/v1_20/v245.go index 541623084b3..a3a012e65b0 100644 --- a/modelmigration/v1_20/v245.go +++ b/modelmigration/v1_20/v245.go @@ -10,19 +10,19 @@ import ( "gitea.dev/modules/setting" ) -func RenameWebhookOrgToOwner(x base.EngineMigration) error { +func RenameWebhookOrgToOwner(ctx context.Context, x base.EngineMigration) error { type Webhook struct { OrgID int64 `xorm:"INDEX"` } // This migration maybe rerun so that we should check if it has been run - ownerExist, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "webhook", "owner_id") + ownerExist, err := x.Dialect().IsColumnExist(x.DB(), ctx, "webhook", "owner_id") if err != nil { return err } if ownerExist { - orgExist, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "webhook", "org_id") + orgExist, err := x.Dialect().IsColumnExist(x.DB(), ctx, "webhook", "org_id") if err != nil { return err } diff --git a/modelmigration/v1_20/v246.go b/modelmigration/v1_20/v246.go index 329a51ee381..a36926bc400 100644 --- a/modelmigration/v1_20/v246.go +++ b/modelmigration/v1_20/v246.go @@ -3,9 +3,13 @@ package v1_20 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddNewColumnForProject(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddNewColumnForProject(_ context.Context, x base.EngineMigration) error { type Project struct { OwnerID int64 `xorm:"INDEX"` } diff --git a/modelmigration/v1_20/v247.go b/modelmigration/v1_20/v247.go index c4cc2253d94..5cd54acba6a 100644 --- a/modelmigration/v1_20/v247.go +++ b/modelmigration/v1_20/v247.go @@ -4,12 +4,14 @@ package v1_20 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/log" ) // FixIncorrectProjectType: set individual project's type from 3(TypeOrganization) to 1(TypeIndividual) -func FixIncorrectProjectType(x base.EngineMigration) error { +func FixIncorrectProjectType(_ context.Context, x base.EngineMigration) error { type User struct { ID int64 `xorm:"pk autoincr"` Type int diff --git a/modelmigration/v1_20/v248.go b/modelmigration/v1_20/v248.go index f3032c4ffe8..b7224b4aef6 100644 --- a/modelmigration/v1_20/v248.go +++ b/modelmigration/v1_20/v248.go @@ -3,9 +3,13 @@ package v1_20 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddVersionToActionRunner(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddVersionToActionRunner(_ context.Context, x base.EngineMigration) error { type ActionRunner struct { Version string `xorm:"VARCHAR(64)"` // the version of act_runner } diff --git a/modelmigration/v1_20/v249.go b/modelmigration/v1_20/v249.go index 015c8a7e7a0..614dd0fcfe5 100644 --- a/modelmigration/v1_20/v249.go +++ b/modelmigration/v1_20/v249.go @@ -4,6 +4,8 @@ package v1_20 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" @@ -40,6 +42,6 @@ func (a *Action) TableIndices() []*schemas.Index { return indices } -func ImproveActionTableIndices(x base.EngineMigration) error { +func ImproveActionTableIndices(_ context.Context, x base.EngineMigration) error { return x.Sync(new(Action)) } diff --git a/modelmigration/v1_20/v250.go b/modelmigration/v1_20/v250.go index 6b1b5a0872a..7aa0a209b5a 100644 --- a/modelmigration/v1_20/v250.go +++ b/modelmigration/v1_20/v250.go @@ -4,13 +4,14 @@ package v1_20 import ( + "context" "strings" "gitea.dev/modelmigration/base" "gitea.dev/modules/json" ) -func ChangeContainerMetadataMultiArch(x base.EngineMigration) error { +func ChangeContainerMetadataMultiArch(_ context.Context, x base.EngineMigration) error { sess := x.NewSession() defer sess.Close() diff --git a/modelmigration/v1_20/v251.go b/modelmigration/v1_20/v251.go index 52e3ea24e76..8be895ecce7 100644 --- a/modelmigration/v1_20/v251.go +++ b/modelmigration/v1_20/v251.go @@ -4,11 +4,13 @@ package v1_20 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/log" ) -func FixIncorrectOwnerTeamUnitAccessMode(x base.EngineMigration) error { +func FixIncorrectOwnerTeamUnitAccessMode(_ context.Context, x base.EngineMigration) error { type UnitType int type AccessMode int diff --git a/modelmigration/v1_20/v252.go b/modelmigration/v1_20/v252.go index 6ca556eb936..9a4e89e45d4 100644 --- a/modelmigration/v1_20/v252.go +++ b/modelmigration/v1_20/v252.go @@ -4,11 +4,13 @@ package v1_20 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/log" ) -func FixIncorrectAdminTeamUnitAccessMode(x base.EngineMigration) error { +func FixIncorrectAdminTeamUnitAccessMode(_ context.Context, x base.EngineMigration) error { type UnitType int type AccessMode int diff --git a/modelmigration/v1_20/v253.go b/modelmigration/v1_20/v253.go index 9d1746b4566..e2e8d413b40 100644 --- a/modelmigration/v1_20/v253.go +++ b/modelmigration/v1_20/v253.go @@ -4,11 +4,13 @@ package v1_20 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/log" ) -func FixExternalTrackerAndExternalWikiAccessModeInOwnerAndAdminTeam(x base.EngineMigration) error { +func FixExternalTrackerAndExternalWikiAccessModeInOwnerAndAdminTeam(_ context.Context, x base.EngineMigration) error { type UnitType int type AccessMode int diff --git a/modelmigration/v1_20/v254.go b/modelmigration/v1_20/v254.go index 50b3bd026e6..0826258cfdd 100644 --- a/modelmigration/v1_20/v254.go +++ b/modelmigration/v1_20/v254.go @@ -3,9 +3,13 @@ package v1_20 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddActionTaskOutputTable(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddActionTaskOutputTable(_ context.Context, x base.EngineMigration) error { type ActionTaskOutput struct { ID int64 TaskID int64 `xorm:"INDEX UNIQUE(task_id_output_key)"` diff --git a/modelmigration/v1_20/v255.go b/modelmigration/v1_20/v255.go index 4f2dca00983..da470aef5d6 100644 --- a/modelmigration/v1_20/v255.go +++ b/modelmigration/v1_20/v255.go @@ -4,11 +4,13 @@ package v1_20 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddArchivedUnixToRepository(x base.EngineMigration) error { +func AddArchivedUnixToRepository(_ context.Context, x base.EngineMigration) error { type Repository struct { ArchivedUnix timeutil.TimeStamp `xorm:"DEFAULT 0"` } diff --git a/modelmigration/v1_20/v256.go b/modelmigration/v1_20/v256.go index 0129b665ac2..cdc69e74bef 100644 --- a/modelmigration/v1_20/v256.go +++ b/modelmigration/v1_20/v256.go @@ -3,9 +3,13 @@ package v1_20 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddIsInternalColumnToPackage(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddIsInternalColumnToPackage(_ context.Context, x base.EngineMigration) error { type Package struct { ID int64 `xorm:"pk autoincr"` OwnerID int64 `xorm:"UNIQUE(s) INDEX NOT NULL"` diff --git a/modelmigration/v1_20/v257.go b/modelmigration/v1_20/v257.go index 52d1f7f5afc..470a63971f4 100644 --- a/modelmigration/v1_20/v257.go +++ b/modelmigration/v1_20/v257.go @@ -4,11 +4,13 @@ package v1_20 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func CreateActionArtifactTable(x base.EngineMigration) error { +func CreateActionArtifactTable(_ context.Context, x base.EngineMigration) error { // ActionArtifact is a file that is stored in the artifact storage. type ActionArtifact struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_20/v258.go b/modelmigration/v1_20/v258.go index 37cc4e45a6e..472977f3432 100644 --- a/modelmigration/v1_20/v258.go +++ b/modelmigration/v1_20/v258.go @@ -3,9 +3,13 @@ package v1_20 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddPinOrderToIssue(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddPinOrderToIssue(_ context.Context, x base.EngineMigration) error { type Issue struct { PinOrder int `xorm:"DEFAULT 0"` } diff --git a/modelmigration/v1_20/v259.go b/modelmigration/v1_20/v259.go index ae60a9357e3..6a262e9a554 100644 --- a/modelmigration/v1_20/v259.go +++ b/modelmigration/v1_20/v259.go @@ -4,6 +4,7 @@ package v1_20 import ( + "context" "fmt" "strings" @@ -318,7 +319,7 @@ type AccessToken struct { Scope string } -func ConvertScopedAccessTokens(x base.EngineMigration) error { +func ConvertScopedAccessTokens(_ context.Context, x base.EngineMigration) error { var tokens []*AccessToken if err := x.Find(&tokens); err != nil { diff --git a/modelmigration/v1_20/v259_test.go b/modelmigration/v1_20/v259_test.go index 3a897d3b3ef..a3f3ee78c19 100644 --- a/modelmigration/v1_20/v259_test.go +++ b/modelmigration/v1_20/v259_test.go @@ -86,11 +86,11 @@ func Test_ConvertScopedAccessTokens(t *testing.T) { } // migrate the scopes - err = ConvertScopedAccessTokens(x) + err = ConvertScopedAccessTokens(t.Context(), x) assert.NoError(t, err) // migrate the scopes again (migration should be idempotent) - err = ConvertScopedAccessTokens(x) + err = ConvertScopedAccessTokens(t.Context(), x) assert.NoError(t, err) tokens := make([]AccessToken, 0) diff --git a/modelmigration/v1_21/v260.go b/modelmigration/v1_21/v260.go index 6795b2f7ba9..0e078435074 100644 --- a/modelmigration/v1_21/v260.go +++ b/modelmigration/v1_21/v260.go @@ -4,10 +4,12 @@ package v1_21 import ( + "context" + "gitea.dev/modelmigration/base" ) -func DropCustomLabelsColumnOfActionRunner(x base.EngineMigration) error { +func DropCustomLabelsColumnOfActionRunner(_ context.Context, x base.EngineMigration) error { sess := x.NewSession() defer sess.Close() diff --git a/modelmigration/v1_21/v261.go b/modelmigration/v1_21/v261.go index 59b139ffb51..f0ffef8d413 100644 --- a/modelmigration/v1_21/v261.go +++ b/modelmigration/v1_21/v261.go @@ -4,11 +4,13 @@ package v1_21 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func CreateVariableTable(x base.EngineMigration) error { +func CreateVariableTable(_ context.Context, x base.EngineMigration) error { type ActionVariable struct { ID int64 `xorm:"pk autoincr"` OwnerID int64 `xorm:"UNIQUE(owner_repo_name)"` diff --git a/modelmigration/v1_21/v262.go b/modelmigration/v1_21/v262.go index 83c156f137d..92160fbeafa 100644 --- a/modelmigration/v1_21/v262.go +++ b/modelmigration/v1_21/v262.go @@ -3,9 +3,13 @@ package v1_21 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddTriggerEventToActionRun(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddTriggerEventToActionRun(_ context.Context, x base.EngineMigration) error { type ActionRun struct { TriggerEvent string } diff --git a/modelmigration/v1_21/v263.go b/modelmigration/v1_21/v263.go index 85d3806c0f2..f5ea230f201 100644 --- a/modelmigration/v1_21/v263.go +++ b/modelmigration/v1_21/v263.go @@ -4,13 +4,14 @@ package v1_21 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) // AddGitSizeAndLFSSizeToRepositoryTable: add GitSize and LFSSize columns to Repository -func AddGitSizeAndLFSSizeToRepositoryTable(x base.EngineMigration) error { +func AddGitSizeAndLFSSizeToRepositoryTable(_ context.Context, x base.EngineMigration) error { type Repository struct { GitSize int64 `xorm:"NOT NULL DEFAULT 0"` LFSSize int64 `xorm:"NOT NULL DEFAULT 0"` diff --git a/modelmigration/v1_21/v264.go b/modelmigration/v1_21/v264.go index 7ecab57c76f..10d45ed0905 100644 --- a/modelmigration/v1_21/v264.go +++ b/modelmigration/v1_21/v264.go @@ -11,7 +11,7 @@ import ( "gitea.dev/modules/timeutil" ) -func AddBranchTable(x base.EngineMigration) error { +func AddBranchTable(ctx context.Context, x base.EngineMigration) error { type Branch struct { ID int64 RepoID int64 `xorm:"UNIQUE(s)"` @@ -59,7 +59,7 @@ func AddBranchTable(x base.EngineMigration) error { } branches := make([]Branch, 0, 100) - if err := base.Iterate(context.Background(), nil, func(ctx context.Context, deletedBranch *DeletedBranch) error { + if err := base.Iterate(ctx, nil, func(ctx context.Context, deletedBranch *DeletedBranch) error { branches = append(branches, Branch{ RepoID: deletedBranch.RepoID, Name: deletedBranch.Name, diff --git a/modelmigration/v1_21/v265.go b/modelmigration/v1_21/v265.go index 4e772e75060..a8be947c21e 100644 --- a/modelmigration/v1_21/v265.go +++ b/modelmigration/v1_21/v265.go @@ -3,9 +3,13 @@ package v1_21 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AlterActionArtifactTable(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AlterActionArtifactTable(_ context.Context, x base.EngineMigration) error { // ActionArtifact is a file that is stored in the artifact storage. type ActionArtifact struct { RunID int64 `xorm:"index unique(runid_name_path)"` // The run id of the artifact diff --git a/modelmigration/v1_21/v266.go b/modelmigration/v1_21/v266.go index a539498b7b8..f404f46d431 100644 --- a/modelmigration/v1_21/v266.go +++ b/modelmigration/v1_21/v266.go @@ -3,9 +3,13 @@ package v1_21 -import "gitea.dev/modelmigration/base" +import ( + "context" -func ReduceCommitStatus(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func ReduceCommitStatus(_ context.Context, x base.EngineMigration) error { sess := x.NewSession() defer sess.Close() diff --git a/modelmigration/v1_21/v267.go b/modelmigration/v1_21/v267.go index 4a9f150e329..60f9bcaa2c0 100644 --- a/modelmigration/v1_21/v267.go +++ b/modelmigration/v1_21/v267.go @@ -4,11 +4,13 @@ package v1_21 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func CreateActionTasksVersionTable(x base.EngineMigration) error { +func CreateActionTasksVersionTable(_ context.Context, x base.EngineMigration) error { type ActionTasksVersion struct { ID int64 `xorm:"pk autoincr"` OwnerID int64 `xorm:"UNIQUE(owner_repo)"` diff --git a/modelmigration/v1_21/v268.go b/modelmigration/v1_21/v268.go index 63fc601281c..dc17a5a22e0 100644 --- a/modelmigration/v1_21/v268.go +++ b/modelmigration/v1_21/v268.go @@ -3,10 +3,14 @@ package v1_21 -import "gitea.dev/modelmigration/base" +import ( + "context" + + "gitea.dev/modelmigration/base" +) // UpdateActionsRefIndex updates the index of actions ref field -func UpdateActionsRefIndex(x base.EngineMigration) error { +func UpdateActionsRefIndex(_ context.Context, x base.EngineMigration) error { type ActionRun struct { Ref string `xorm:"index"` // the commit/tag/… causing the run } diff --git a/modelmigration/v1_21/v269.go b/modelmigration/v1_21/v269.go index 635663caa79..c5852bd6f54 100644 --- a/modelmigration/v1_21/v269.go +++ b/modelmigration/v1_21/v269.go @@ -3,8 +3,12 @@ package v1_21 -import "gitea.dev/modelmigration/base" +import ( + "context" -func DropDeletedBranchTable(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func DropDeletedBranchTable(_ context.Context, x base.EngineMigration) error { return x.DropTables("deleted_branch") } diff --git a/modelmigration/v1_21/v270.go b/modelmigration/v1_21/v270.go index 56b876bd65a..3d01e474e41 100644 --- a/modelmigration/v1_21/v270.go +++ b/modelmigration/v1_21/v270.go @@ -3,9 +3,13 @@ package v1_21 -import "gitea.dev/modelmigration/base" +import ( + "context" -func FixPackagePropertyTypo(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func FixPackagePropertyTypo(_ context.Context, x base.EngineMigration) error { sess := x.NewSession() defer sess.Close() diff --git a/modelmigration/v1_21/v271.go b/modelmigration/v1_21/v271.go index 418d1ba2144..3db61f93c05 100644 --- a/modelmigration/v1_21/v271.go +++ b/modelmigration/v1_21/v271.go @@ -4,11 +4,13 @@ package v1_21 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddArchivedUnixColumInLabelTable(x base.EngineMigration) error { +func AddArchivedUnixColumInLabelTable(_ context.Context, x base.EngineMigration) error { type Label struct { ArchivedUnix timeutil.TimeStamp `xorm:"DEFAULT NULL"` } diff --git a/modelmigration/v1_21/v272.go b/modelmigration/v1_21/v272.go index b4cc3490d85..b027c7139a4 100644 --- a/modelmigration/v1_21/v272.go +++ b/modelmigration/v1_21/v272.go @@ -3,9 +3,13 @@ package v1_21 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddVersionToActionRunTable(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddVersionToActionRunTable(_ context.Context, x base.EngineMigration) error { type ActionRun struct { Version int `xorm:"version default 0"` } diff --git a/modelmigration/v1_21/v273.go b/modelmigration/v1_21/v273.go index b024e713c61..90985038dd0 100644 --- a/modelmigration/v1_21/v273.go +++ b/modelmigration/v1_21/v273.go @@ -4,11 +4,13 @@ package v1_21 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddActionScheduleTable(x base.EngineMigration) error { +func AddActionScheduleTable(_ context.Context, x base.EngineMigration) error { type ActionSchedule struct { ID int64 Title string diff --git a/modelmigration/v1_21/v274.go b/modelmigration/v1_21/v274.go index 6fa76f85080..1d220b777f6 100644 --- a/modelmigration/v1_21/v274.go +++ b/modelmigration/v1_21/v274.go @@ -4,13 +4,14 @@ package v1_21 import ( + "context" "time" "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddExpiredUnixColumnInActionArtifactTable(x base.EngineMigration) error { +func AddExpiredUnixColumnInActionArtifactTable(_ context.Context, x base.EngineMigration) error { type ActionArtifact struct { ExpiredUnix timeutil.TimeStamp `xorm:"index"` // time when the artifact will be expired } diff --git a/modelmigration/v1_21/v275.go b/modelmigration/v1_21/v275.go index dc8026af7af..776c3cb4ac0 100644 --- a/modelmigration/v1_21/v275.go +++ b/modelmigration/v1_21/v275.go @@ -3,9 +3,13 @@ package v1_21 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddScheduleIDForActionRun(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddScheduleIDForActionRun(_ context.Context, x base.EngineMigration) error { type ActionRun struct { ScheduleID int64 } diff --git a/modelmigration/v1_21/v276.go b/modelmigration/v1_21/v276.go index 7ad785020de..6d8dcdfe4e5 100644 --- a/modelmigration/v1_21/v276.go +++ b/modelmigration/v1_21/v276.go @@ -11,7 +11,7 @@ import ( "gitea.dev/modules/setting" ) -func AddRemoteAddressToMirrors(x base.EngineMigration) error { +func AddRemoteAddressToMirrors(ctx context.Context, x base.EngineMigration) error { type Mirror struct { RemoteAddress string `xorm:"VARCHAR(2048)"` } @@ -24,14 +24,14 @@ func AddRemoteAddressToMirrors(x base.EngineMigration) error { return err } - if err := migratePullMirrors(x); err != nil { + if err := migratePullMirrors(ctx, x); err != nil { return err } - return migratePushMirrors(x) + return migratePushMirrors(ctx, x) } -func migratePullMirrors(x base.EngineMigration) error { +func migratePullMirrors(ctx context.Context, x base.EngineMigration) error { type Mirror struct { ID int64 `xorm:"pk autoincr"` RepoID int64 `xorm:"INDEX"` @@ -68,7 +68,7 @@ func migratePullMirrors(x base.EngineMigration) error { start += len(mirrors) for _, m := range mirrors { - remoteAddress, err := getRemoteAddress(m.RepoOwner, m.RepoName, "origin") + remoteAddress, err := getRemoteAddress(ctx, m.RepoOwner, m.RepoName, "origin") if err != nil { return err } @@ -93,7 +93,7 @@ func migratePullMirrors(x base.EngineMigration) error { return sess.Commit() } -func migratePushMirrors(x base.EngineMigration) error { +func migratePushMirrors(ctx context.Context, x base.EngineMigration) error { type PushMirror struct { ID int64 `xorm:"pk autoincr"` RepoID int64 `xorm:"INDEX"` @@ -131,7 +131,7 @@ func migratePushMirrors(x base.EngineMigration) error { start += len(mirrors) for _, m := range mirrors { - remoteAddress, err := getRemoteAddress(m.RepoOwner, m.RepoName, m.RemoteName) + remoteAddress, err := getRemoteAddress(ctx, m.RepoOwner, m.RepoName, m.RemoteName) if err != nil { return err } @@ -156,8 +156,7 @@ func migratePushMirrors(x base.EngineMigration) error { return sess.Commit() } -func getRemoteAddress(ownerName, repoName, remoteName string) (string, error) { - ctx := context.Background() +func getRemoteAddress(ctx context.Context, ownerName, repoName, remoteName string) (string, error) { repo := base.LocalCodeGitRepo(ownerName, repoName) if exist, _ := git.IsRepositoryExist(ctx, repo); !exist { return "", nil diff --git a/modelmigration/v1_21/v277.go b/modelmigration/v1_21/v277.go index 8dd84db9f2d..56ea71959a4 100644 --- a/modelmigration/v1_21/v277.go +++ b/modelmigration/v1_21/v277.go @@ -3,9 +3,13 @@ package v1_21 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddIndexToIssueUserIssueID(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddIndexToIssueUserIssueID(_ context.Context, x base.EngineMigration) error { type IssueUser struct { IssueID int64 `xorm:"INDEX"` } diff --git a/modelmigration/v1_21/v278.go b/modelmigration/v1_21/v278.go index 3250ee340dd..296b121db90 100644 --- a/modelmigration/v1_21/v278.go +++ b/modelmigration/v1_21/v278.go @@ -3,9 +3,13 @@ package v1_21 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddIndexToCommentDependentIssueID(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddIndexToCommentDependentIssueID(_ context.Context, x base.EngineMigration) error { type Comment struct { DependentIssueID int64 `xorm:"index"` } diff --git a/modelmigration/v1_21/v279.go b/modelmigration/v1_21/v279.go index ab0ca19e52e..225a511fe18 100644 --- a/modelmigration/v1_21/v279.go +++ b/modelmigration/v1_21/v279.go @@ -4,12 +4,14 @@ package v1_21 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddIndexToActionUserID(x base.EngineMigration) error { +func AddIndexToActionUserID(_ context.Context, x base.EngineMigration) error { type Action struct { UserID int64 `xorm:"INDEX"` } diff --git a/modelmigration/v1_22/v280.go b/modelmigration/v1_22/v280.go index 918d7d56520..514e3c932e6 100644 --- a/modelmigration/v1_22/v280.go +++ b/modelmigration/v1_22/v280.go @@ -3,9 +3,13 @@ package v1_22 -import "gitea.dev/modelmigration/base" +import ( + "context" -func RenameUserThemes(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func RenameUserThemes(_ context.Context, x base.EngineMigration) error { sess := x.NewSession() defer sess.Close() diff --git a/modelmigration/v1_22/v281.go b/modelmigration/v1_22/v281.go index e75795ba71d..cf60c8c7860 100644 --- a/modelmigration/v1_22/v281.go +++ b/modelmigration/v1_22/v281.go @@ -4,11 +4,13 @@ package v1_22 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func CreateAuthTokenTable(x base.EngineMigration) error { +func CreateAuthTokenTable(_ context.Context, x base.EngineMigration) error { type AuthToken struct { ID string `xorm:"pk"` TokenHash string diff --git a/modelmigration/v1_22/v282.go b/modelmigration/v1_22/v282.go index cf691325673..23343988433 100644 --- a/modelmigration/v1_22/v282.go +++ b/modelmigration/v1_22/v282.go @@ -3,9 +3,13 @@ package v1_22 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddIndexToPullAutoMergeDoerID(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddIndexToPullAutoMergeDoerID(_ context.Context, x base.EngineMigration) error { type PullAutoMerge struct { DoerID int64 `xorm:"INDEX NOT NULL"` } diff --git a/modelmigration/v1_22/v283.go b/modelmigration/v1_22/v283.go index 31818ae1500..4ffa9969b57 100644 --- a/modelmigration/v1_22/v283.go +++ b/modelmigration/v1_22/v283.go @@ -4,6 +4,7 @@ package v1_22 import ( + "context" "fmt" "gitea.dev/modelmigration/base" @@ -11,7 +12,7 @@ import ( "xorm.io/xorm/schemas" ) -func AddCombinedIndexToIssueUser(x base.EngineMigration) error { +func AddCombinedIndexToIssueUser(_ context.Context, x base.EngineMigration) error { type OldIssueUser struct { IssueID int64 UID int64 diff --git a/modelmigration/v1_22/v283_test.go b/modelmigration/v1_22/v283_test.go index 40afe14593b..a0ae3a553df 100644 --- a/modelmigration/v1_22/v283_test.go +++ b/modelmigration/v1_22/v283_test.go @@ -24,5 +24,5 @@ func Test_AddCombinedIndexToIssueUser(t *testing.T) { x, deferable := migrationtest.PrepareTestEnv(t, 0, new(IssueUser)) defer deferable() - assert.NoError(t, AddCombinedIndexToIssueUser(x)) + assert.NoError(t, AddCombinedIndexToIssueUser(t.Context(), x)) } diff --git a/modelmigration/v1_22/v284.go b/modelmigration/v1_22/v284.go index 27d38a0cee7..f1a968ec42d 100644 --- a/modelmigration/v1_22/v284.go +++ b/modelmigration/v1_22/v284.go @@ -4,12 +4,14 @@ package v1_22 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddIgnoreStaleApprovalsColumnToProtectedBranchTable(x base.EngineMigration) error { +func AddIgnoreStaleApprovalsColumnToProtectedBranchTable(_ context.Context, x base.EngineMigration) error { type ProtectedBranch struct { IgnoreStaleApprovals bool `xorm:"NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_22/v285.go b/modelmigration/v1_22/v285.go index e3b08eaeb75..2713a77ca4f 100644 --- a/modelmigration/v1_22/v285.go +++ b/modelmigration/v1_22/v285.go @@ -4,6 +4,7 @@ package v1_22 import ( + "context" "time" "gitea.dev/modelmigration/base" @@ -11,7 +12,7 @@ import ( "xorm.io/xorm" ) -func AddPreviousDurationToActionRun(x base.EngineMigration) error { +func AddPreviousDurationToActionRun(_ context.Context, x base.EngineMigration) error { type ActionRun struct { PreviousDuration time.Duration } diff --git a/modelmigration/v1_22/v286.go b/modelmigration/v1_22/v286.go index 6e6058890f7..a104c65c2db 100644 --- a/modelmigration/v1_22/v286.go +++ b/modelmigration/v1_22/v286.go @@ -3,6 +3,7 @@ package v1_22 import ( + "context" "errors" "fmt" @@ -100,7 +101,7 @@ func addObjectFormatNameToRepository(x base.EngineMigration) error { return err } -func AdjustDBForSha256(x base.EngineMigration) error { +func AdjustDBForSha256(_ context.Context, x base.EngineMigration) error { if err := expandHashReferencesToSha256(x); err != nil { return err } diff --git a/modelmigration/v1_22/v286_test.go b/modelmigration/v1_22/v286_test.go index 53956803b74..5ee48a79530 100644 --- a/modelmigration/v1_22/v286_test.go +++ b/modelmigration/v1_22/v286_test.go @@ -81,7 +81,7 @@ func Test_RepositoryFormat(t *testing.T) { x, deferable := PrepareOldRepository(t) defer deferable() - assert.NoError(t, AdjustDBForSha256(x)) + assert.NoError(t, AdjustDBForSha256(t.Context(), x)) type Repository struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_22/v287.go b/modelmigration/v1_22/v287.go index e85b4dbbe51..a42b5b80acf 100644 --- a/modelmigration/v1_22/v287.go +++ b/modelmigration/v1_22/v287.go @@ -3,7 +3,11 @@ package v1_22 -import "gitea.dev/modelmigration/base" +import ( + "context" + + "gitea.dev/modelmigration/base" +) type BadgeUnique struct { ID int64 `xorm:"pk autoincr"` @@ -14,7 +18,7 @@ func (BadgeUnique) TableName() string { return "badge" } -func UseSlugInsteadOfIDForBadges(x base.EngineMigration) error { +func UseSlugInsteadOfIDForBadges(_ context.Context, x base.EngineMigration) error { type Badge struct { Slug string } diff --git a/modelmigration/v1_22/v287_test.go b/modelmigration/v1_22/v287_test.go index 28d4c290151..fa1ef7fa15b 100644 --- a/modelmigration/v1_22/v287_test.go +++ b/modelmigration/v1_22/v287_test.go @@ -37,7 +37,7 @@ func Test_UpdateBadgeColName(t *testing.T) { assert.NoError(t, err) } - if err := UseSlugInsteadOfIDForBadges(x); err != nil { + if err := UseSlugInsteadOfIDForBadges(t.Context(), x); err != nil { assert.NoError(t, err) return } diff --git a/modelmigration/v1_22/v288.go b/modelmigration/v1_22/v288.go index a9913180df5..298157c4d72 100644 --- a/modelmigration/v1_22/v288.go +++ b/modelmigration/v1_22/v288.go @@ -4,6 +4,8 @@ package v1_22 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) @@ -20,6 +22,6 @@ func (*Blocking) TableName() string { return "user_blocking" } -func AddUserBlockingTable(x base.EngineMigration) error { +func AddUserBlockingTable(_ context.Context, x base.EngineMigration) error { return x.Sync(&Blocking{}) } diff --git a/modelmigration/v1_22/v289.go b/modelmigration/v1_22/v289.go index 72fce2be67e..a73f2404747 100644 --- a/modelmigration/v1_22/v289.go +++ b/modelmigration/v1_22/v289.go @@ -4,12 +4,14 @@ package v1_22 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddDefaultWikiBranch(x base.EngineMigration) error { +func AddDefaultWikiBranch(_ context.Context, x base.EngineMigration) error { type Repository struct { ID int64 DefaultWikiBranch string diff --git a/modelmigration/v1_22/v290.go b/modelmigration/v1_22/v290.go index 1370315a7fd..2df50a1f1d2 100644 --- a/modelmigration/v1_22/v290.go +++ b/modelmigration/v1_22/v290.go @@ -4,6 +4,8 @@ package v1_22 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" @@ -13,7 +15,7 @@ type HookTask struct { PayloadVersion int `xorm:"DEFAULT 1"` } -func AddPayloadVersionToHookTaskTable(x base.EngineMigration) error { +func AddPayloadVersionToHookTaskTable(_ context.Context, x base.EngineMigration) error { // create missing column if _, err := x.SyncWithOptions(xorm.SyncOptions{ IgnoreIndices: true, diff --git a/modelmigration/v1_22/v291.go b/modelmigration/v1_22/v291.go index bb28dd62c34..dcd01802bde 100644 --- a/modelmigration/v1_22/v291.go +++ b/modelmigration/v1_22/v291.go @@ -4,12 +4,14 @@ package v1_22 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddCommentIDIndexofAttachment(x base.EngineMigration) error { +func AddCommentIDIndexofAttachment(_ context.Context, x base.EngineMigration) error { type Attachment struct { CommentID int64 `xorm:"INDEX"` } diff --git a/modelmigration/v1_22/v293.go b/modelmigration/v1_22/v293.go index 492f312335f..cd17b6c575d 100644 --- a/modelmigration/v1_22/v293.go +++ b/modelmigration/v1_22/v293.go @@ -4,6 +4,8 @@ package v1_22 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/setting" "gitea.dev/modules/timeutil" @@ -28,7 +30,7 @@ func (ProjectBoardV293) TableName() string { } // CheckProjectColumnsConsistency ensures there is exactly one default board per project present -func CheckProjectColumnsConsistency(x base.EngineMigration) error { +func CheckProjectColumnsConsistency(_ context.Context, x base.EngineMigration) error { sess := x.NewSession() defer sess.Close() diff --git a/modelmigration/v1_22/v293_test.go b/modelmigration/v1_22/v293_test.go index e3d86aed6ab..bbf1f2d9287 100644 --- a/modelmigration/v1_22/v293_test.go +++ b/modelmigration/v1_22/v293_test.go @@ -36,7 +36,7 @@ func Test_CheckProjectColumnsConsistency(t *testing.T) { return } - assert.NoError(t, CheckProjectColumnsConsistency(x)) + assert.NoError(t, CheckProjectColumnsConsistency(t.Context(), x)) // check if default column was added var defaultColumn ProjectBoardV293 diff --git a/modelmigration/v1_22/v294.go b/modelmigration/v1_22/v294.go index 11ee21ddf8c..5df6e3db3d1 100644 --- a/modelmigration/v1_22/v294.go +++ b/modelmigration/v1_22/v294.go @@ -4,6 +4,7 @@ package v1_22 import ( + "context" "fmt" "gitea.dev/modelmigration/base" @@ -12,7 +13,7 @@ import ( ) // AddUniqueIndexForProjectIssue adds unique indexes for project issue table -func AddUniqueIndexForProjectIssue(x base.EngineMigration) error { +func AddUniqueIndexForProjectIssue(_ context.Context, x base.EngineMigration) error { // remove possible duplicated records in table project_issue type result struct { IssueID int64 diff --git a/modelmigration/v1_22/v294_test.go b/modelmigration/v1_22/v294_test.go index 91e14aa2188..1417d8d3617 100644 --- a/modelmigration/v1_22/v294_test.go +++ b/modelmigration/v1_22/v294_test.go @@ -30,7 +30,7 @@ func Test_AddUniqueIndexForProjectIssue(t *testing.T) { assert.NoError(t, err) assert.EqualValues(t, 2, cnt) - assert.NoError(t, AddUniqueIndexForProjectIssue(x)) + assert.NoError(t, AddUniqueIndexForProjectIssue(t.Context(), x)) cnt, err = x.Table("project_issue").Where("project_id=1 AND issue_id=1").Count() assert.NoError(t, err) diff --git a/modelmigration/v1_22/v295.go b/modelmigration/v1_22/v295.go index cde1cc46311..d6bf23ae091 100644 --- a/modelmigration/v1_22/v295.go +++ b/modelmigration/v1_22/v295.go @@ -3,9 +3,13 @@ package v1_22 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddCommitStatusSummary(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddCommitStatusSummary(_ context.Context, x base.EngineMigration) error { type CommitStatusSummary struct { ID int64 `xorm:"pk autoincr"` RepoID int64 `xorm:"INDEX UNIQUE(repo_id_sha)"` diff --git a/modelmigration/v1_22/v296.go b/modelmigration/v1_22/v296.go index e955a595049..758849bbb8f 100644 --- a/modelmigration/v1_22/v296.go +++ b/modelmigration/v1_22/v296.go @@ -3,9 +3,13 @@ package v1_22 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddCommitStatusSummary2(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddCommitStatusSummary2(_ context.Context, x base.EngineMigration) error { type CommitStatusSummary struct { ID int64 `xorm:"pk autoincr"` TargetURL string `xorm:"TEXT"` diff --git a/modelmigration/v1_22/v297.go b/modelmigration/v1_22/v297.go index 2f03e342eb6..09afd86ccc9 100644 --- a/modelmigration/v1_22/v297.go +++ b/modelmigration/v1_22/v297.go @@ -4,10 +4,12 @@ package v1_22 import ( + "context" + "gitea.dev/modelmigration/base" ) -func AddRepoUnitEveryoneAccessMode(x base.EngineMigration) error { +func AddRepoUnitEveryoneAccessMode(_ context.Context, x base.EngineMigration) error { type RepoUnit struct { //revive:disable-line:exported EveryoneAccessMode int `xorm:"NOT NULL DEFAULT 0"` } diff --git a/modelmigration/v1_22/v298.go b/modelmigration/v1_22/v298.go index 30477ad529d..52c2e7324e9 100644 --- a/modelmigration/v1_22/v298.go +++ b/modelmigration/v1_22/v298.go @@ -3,8 +3,12 @@ package v1_22 -import "gitea.dev/modelmigration/base" +import ( + "context" -func DropWronglyCreatedTable(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func DropWronglyCreatedTable(_ context.Context, x base.EngineMigration) error { return x.DropTables("o_auth2_application") } diff --git a/modelmigration/v1_23/v299.go b/modelmigration/v1_23/v299.go index 2f4454eb451..9e083fd7965 100644 --- a/modelmigration/v1_23/v299.go +++ b/modelmigration/v1_23/v299.go @@ -4,12 +4,14 @@ package v1_23 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddContentVersionToIssueAndComment(x base.EngineMigration) error { +func AddContentVersionToIssueAndComment(_ context.Context, x base.EngineMigration) error { type Issue struct { ContentVersion int `xorm:"NOT NULL DEFAULT 0"` } diff --git a/modelmigration/v1_23/v300.go b/modelmigration/v1_23/v300.go index 2c78f673648..b445b91ddf3 100644 --- a/modelmigration/v1_23/v300.go +++ b/modelmigration/v1_23/v300.go @@ -4,12 +4,14 @@ package v1_23 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddForcePushBranchProtection(x base.EngineMigration) error { +func AddForcePushBranchProtection(_ context.Context, x base.EngineMigration) error { type ProtectedBranch struct { CanForcePush bool `xorm:"NOT NULL DEFAULT false"` EnableForcePushAllowlist bool `xorm:"NOT NULL DEFAULT false"` diff --git a/modelmigration/v1_23/v301.go b/modelmigration/v1_23/v301.go index 245a0f57498..4257e099df9 100644 --- a/modelmigration/v1_23/v301.go +++ b/modelmigration/v1_23/v301.go @@ -4,13 +4,15 @@ package v1_23 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) // AddSkipSeconderyAuthToOAuth2ApplicationTable: add SkipSecondaryAuthorization column, setting existing rows to false -func AddSkipSecondaryAuthColumnToOAuth2ApplicationTable(x base.EngineMigration) error { +func AddSkipSecondaryAuthColumnToOAuth2ApplicationTable(_ context.Context, x base.EngineMigration) error { type oauth2Application struct { SkipSecondaryAuthorization bool `xorm:"NOT NULL DEFAULT FALSE"` } diff --git a/modelmigration/v1_23/v302.go b/modelmigration/v1_23/v302.go index 78fd630e4c7..b7f3e6d9df4 100644 --- a/modelmigration/v1_23/v302.go +++ b/modelmigration/v1_23/v302.go @@ -4,13 +4,15 @@ package v1_23 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" "xorm.io/xorm" ) -func AddIndexToActionTaskStoppedLogExpired(x base.EngineMigration) error { +func AddIndexToActionTaskStoppedLogExpired(_ context.Context, x base.EngineMigration) error { type ActionTask struct { Stopped timeutil.TimeStamp `xorm:"index(stopped_log_expired)"` LogExpired bool `xorm:"index(stopped_log_expired)"` diff --git a/modelmigration/v1_23/v302_test.go b/modelmigration/v1_23/v302_test.go index a6a90333053..8d98e5438c6 100644 --- a/modelmigration/v1_23/v302_test.go +++ b/modelmigration/v1_23/v302_test.go @@ -47,5 +47,5 @@ func Test_AddIndexToActionTaskStoppedLogExpired(t *testing.T) { x, deferable := migrationtest.PrepareTestEnv(t, 0, new(ActionTask)) defer deferable() - assert.NoError(t, AddIndexToActionTaskStoppedLogExpired(x)) + assert.NoError(t, AddIndexToActionTaskStoppedLogExpired(t.Context(), x)) } diff --git a/modelmigration/v1_23/v303.go b/modelmigration/v1_23/v303.go index a73e852f358..c76e577768a 100644 --- a/modelmigration/v1_23/v303.go +++ b/modelmigration/v1_23/v303.go @@ -4,6 +4,8 @@ package v1_23 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" @@ -16,7 +18,7 @@ type CommentMetaData struct { ProjectTitle string `json:"project_title"` } -func AddCommentMetaDataColumn(x base.EngineMigration) error { +func AddCommentMetaDataColumn(_ context.Context, x base.EngineMigration) error { type Comment struct { CommentMetaData *CommentMetaData `xorm:"JSON TEXT"` // put all non-index metadata in a single field } diff --git a/modelmigration/v1_23/v304.go b/modelmigration/v1_23/v304.go index fa6e7cb1e83..bd710b4067d 100644 --- a/modelmigration/v1_23/v304.go +++ b/modelmigration/v1_23/v304.go @@ -4,12 +4,14 @@ package v1_23 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddIndexForReleaseSha1(x base.EngineMigration) error { +func AddIndexForReleaseSha1(_ context.Context, x base.EngineMigration) error { type Release struct { Sha1 string `xorm:"INDEX VARCHAR(64)"` } diff --git a/modelmigration/v1_23/v304_test.go b/modelmigration/v1_23/v304_test.go index 1672e466268..7f4e7d6f55a 100644 --- a/modelmigration/v1_23/v304_test.go +++ b/modelmigration/v1_23/v304_test.go @@ -36,5 +36,5 @@ func Test_AddIndexForReleaseSha1(t *testing.T) { x, deferable := migrationtest.PrepareTestEnv(t, 0, new(Release)) defer deferable() - assert.NoError(t, AddIndexForReleaseSha1(x)) + assert.NoError(t, AddIndexForReleaseSha1(t.Context(), x)) } diff --git a/modelmigration/v1_23/v305.go b/modelmigration/v1_23/v305.go index 823d04e599f..1df8574f07a 100644 --- a/modelmigration/v1_23/v305.go +++ b/modelmigration/v1_23/v305.go @@ -4,11 +4,13 @@ package v1_23 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddRepositoryLicenses(x base.EngineMigration) error { +func AddRepositoryLicenses(_ context.Context, x base.EngineMigration) error { type RepoLicense struct { ID int64 `xorm:"pk autoincr"` RepoID int64 `xorm:"UNIQUE(s) NOT NULL"` diff --git a/modelmigration/v1_23/v306.go b/modelmigration/v1_23/v306.go index 843f578f612..bf3734d64d5 100644 --- a/modelmigration/v1_23/v306.go +++ b/modelmigration/v1_23/v306.go @@ -4,12 +4,14 @@ package v1_23 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddBlockAdminMergeOverrideBranchProtection(x base.EngineMigration) error { +func AddBlockAdminMergeOverrideBranchProtection(_ context.Context, x base.EngineMigration) error { type ProtectedBranch struct { BlockAdminMergeOverride bool `xorm:"NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_23/v307.go b/modelmigration/v1_23/v307.go index 94e6346d8ff..2c75c41785e 100644 --- a/modelmigration/v1_23/v307.go +++ b/modelmigration/v1_23/v307.go @@ -4,11 +4,13 @@ package v1_23 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func FixMilestoneNoDueDate(x base.EngineMigration) error { +func FixMilestoneNoDueDate(_ context.Context, x base.EngineMigration) error { type Milestone struct { DeadlineUnix timeutil.TimeStamp } diff --git a/modelmigration/v1_23/v308.go b/modelmigration/v1_23/v308.go index 1dfd225c191..f89028ab777 100644 --- a/modelmigration/v1_23/v308.go +++ b/modelmigration/v1_23/v308.go @@ -4,6 +4,8 @@ package v1_23 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" @@ -47,6 +49,6 @@ func (a *improveActionTableIndicesAction) TableIndices() []*schemas.Index { return indices } -func AddNewIndexForUserDashboard(x base.EngineMigration) error { +func AddNewIndexForUserDashboard(_ context.Context, x base.EngineMigration) error { return x.Sync(new(improveActionTableIndicesAction)) } diff --git a/modelmigration/v1_23/v309.go b/modelmigration/v1_23/v309.go index 40a1650a992..5388e68f462 100644 --- a/modelmigration/v1_23/v309.go +++ b/modelmigration/v1_23/v309.go @@ -4,6 +4,8 @@ package v1_23 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" @@ -72,6 +74,6 @@ func (*improveNotificationTableIndicesAction) TableIndices() []*schemas.Index { return indices } -func ImproveNotificationTableIndices(x base.EngineMigration) error { +func ImproveNotificationTableIndices(_ context.Context, x base.EngineMigration) error { return x.Sync(&improveNotificationTableIndicesAction{}) } diff --git a/modelmigration/v1_23/v310.go b/modelmigration/v1_23/v310.go index b2d51cd93d7..70b2212e236 100644 --- a/modelmigration/v1_23/v310.go +++ b/modelmigration/v1_23/v310.go @@ -4,12 +4,14 @@ package v1_23 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddPriorityToProtectedBranch(x base.EngineMigration) error { +func AddPriorityToProtectedBranch(_ context.Context, x base.EngineMigration) error { type ProtectedBranch struct { Priority int64 `xorm:"NOT NULL DEFAULT 0"` } diff --git a/modelmigration/v1_23/v311.go b/modelmigration/v1_23/v311.go index 4c2bfd9a075..bc80bccbf05 100644 --- a/modelmigration/v1_23/v311.go +++ b/modelmigration/v1_23/v311.go @@ -4,12 +4,14 @@ package v1_23 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddTimeEstimateColumnToIssueTable(x base.EngineMigration) error { +func AddTimeEstimateColumnToIssueTable(_ context.Context, x base.EngineMigration) error { type Issue struct { TimeEstimate int64 `xorm:"NOT NULL DEFAULT 0"` } diff --git a/modelmigration/v1_24/v312.go b/modelmigration/v1_24/v312.go index 8b35b2e25fe..3eccf2df083 100644 --- a/modelmigration/v1_24/v312.go +++ b/modelmigration/v1_24/v312.go @@ -4,6 +4,8 @@ package v1_24 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" @@ -18,7 +20,7 @@ func (pullAutoMerge) TableName() string { return "pull_auto_merge" } -func AddDeleteBranchAfterMergeForAutoMerge(x base.EngineMigration) error { +func AddDeleteBranchAfterMergeForAutoMerge(_ context.Context, x base.EngineMigration) error { _, err := x.SyncWithOptions(xorm.SyncOptions{ IgnoreConstrains: true, IgnoreIndices: true, diff --git a/modelmigration/v1_24/v313.go b/modelmigration/v1_24/v313.go index 3584e3af349..0379b20e3ca 100644 --- a/modelmigration/v1_24/v313.go +++ b/modelmigration/v1_24/v313.go @@ -4,10 +4,12 @@ package v1_24 import ( + "context" + "gitea.dev/modelmigration/base" ) -func MovePinOrderToTableIssuePin(x base.EngineMigration) error { +func MovePinOrderToTableIssuePin(_ context.Context, x base.EngineMigration) error { type IssuePin struct { ID int64 `xorm:"pk autoincr"` RepoID int64 `xorm:"UNIQUE(s) NOT NULL"` diff --git a/modelmigration/v1_24/v314.go b/modelmigration/v1_24/v314.go index 7202e659c3f..ff5e4dca7cb 100644 --- a/modelmigration/v1_24/v314.go +++ b/modelmigration/v1_24/v314.go @@ -3,9 +3,13 @@ package v1_24 -import "gitea.dev/modelmigration/base" +import ( + "context" -func UpdateOwnerIDOfRepoLevelActionsTables(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func UpdateOwnerIDOfRepoLevelActionsTables(_ context.Context, x base.EngineMigration) error { if _, err := x.Exec("UPDATE `action_runner` SET `owner_id` = 0 WHERE `repo_id` > 0 AND `owner_id` > 0"); err != nil { return err } diff --git a/modelmigration/v1_24/v315.go b/modelmigration/v1_24/v315.go index 0130cfcd3ec..a2d0ab92015 100644 --- a/modelmigration/v1_24/v315.go +++ b/modelmigration/v1_24/v315.go @@ -4,12 +4,14 @@ package v1_24 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddEphemeralToActionRunner(x base.EngineMigration) error { +func AddEphemeralToActionRunner(_ context.Context, x base.EngineMigration) error { type ActionRunner struct { Ephemeral bool `xorm:"ephemeral NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_24/v316.go b/modelmigration/v1_24/v316.go index f09984f0b2b..839bf088478 100644 --- a/modelmigration/v1_24/v316.go +++ b/modelmigration/v1_24/v316.go @@ -4,12 +4,14 @@ package v1_24 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddDescriptionForSecretsAndVariables(x base.EngineMigration) error { +func AddDescriptionForSecretsAndVariables(_ context.Context, x base.EngineMigration) error { type Secret struct { Description string `xorm:"TEXT"` } diff --git a/modelmigration/v1_24/v317.go b/modelmigration/v1_24/v317.go index 2b359b6ce0a..d5b58dd7a14 100644 --- a/modelmigration/v1_24/v317.go +++ b/modelmigration/v1_24/v317.go @@ -4,6 +4,8 @@ package v1_24 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" @@ -51,6 +53,6 @@ func (a *improveActionTableIndicesAction) TableIndices() []*schemas.Index { return indices } -func AddNewIndexForUserDashboard(x base.EngineMigration) error { +func AddNewIndexForUserDashboard(_ context.Context, x base.EngineMigration) error { return x.Sync(new(improveActionTableIndicesAction)) } diff --git a/modelmigration/v1_24/v318.go b/modelmigration/v1_24/v318.go index 218126093a9..79cbd2b7b96 100644 --- a/modelmigration/v1_24/v318.go +++ b/modelmigration/v1_24/v318.go @@ -4,12 +4,14 @@ package v1_24 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddRepoUnitAnonymousAccessMode(x base.EngineMigration) error { +func AddRepoUnitAnonymousAccessMode(_ context.Context, x base.EngineMigration) error { type RepoUnit struct { //revive:disable-line:exported AnonymousAccessMode int `xorm:"NOT NULL DEFAULT 0"` } diff --git a/modelmigration/v1_24/v319.go b/modelmigration/v1_24/v319.go index bd9bf2725cd..5e51e26bf74 100644 --- a/modelmigration/v1_24/v319.go +++ b/modelmigration/v1_24/v319.go @@ -4,12 +4,14 @@ package v1_24 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddExclusiveOrderColumnToLabelTable(x base.EngineMigration) error { +func AddExclusiveOrderColumnToLabelTable(_ context.Context, x base.EngineMigration) error { type Label struct { ExclusiveOrder int `xorm:"DEFAULT 0"` } diff --git a/modelmigration/v1_24/v320.go b/modelmigration/v1_24/v320.go index 742f580e866..f9341f0f392 100644 --- a/modelmigration/v1_24/v320.go +++ b/modelmigration/v1_24/v320.go @@ -4,13 +4,15 @@ package v1_24 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/json" "xorm.io/xorm" ) -func MigrateSkipTwoFactor(x base.EngineMigration) error { +func MigrateSkipTwoFactor(_ context.Context, x base.EngineMigration) error { type LoginSource struct { TwoFactorPolicy string `xorm:"two_factor_policy NOT NULL DEFAULT ''"` } diff --git a/modelmigration/v1_25/v321.go b/modelmigration/v1_25/v321.go index dceb08c2baf..2a4920c2c67 100644 --- a/modelmigration/v1_25/v321.go +++ b/modelmigration/v1_25/v321.go @@ -4,18 +4,20 @@ package v1_25 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/setting" "xorm.io/xorm/schemas" ) -func UseLongTextInSomeColumnsAndFixBugs(x base.EngineMigration) error { +func UseLongTextInSomeColumnsAndFixBugs(ctx context.Context, x base.EngineMigration) error { if !setting.Database.Type.IsMySQL() { return nil // Only mysql need to change from text to long text, for other databases, they are the same } - if err := base.ModifyColumn(x, "review_state", &schemas.Column{ + if err := base.ModifyColumn(ctx, x, "review_state", &schemas.Column{ Name: "updated_files", SQLType: schemas.SQLType{ Name: "LONGTEXT", @@ -27,7 +29,7 @@ func UseLongTextInSomeColumnsAndFixBugs(x base.EngineMigration) error { return err } - if err := base.ModifyColumn(x, "package_property", &schemas.Column{ + if err := base.ModifyColumn(ctx, x, "package_property", &schemas.Column{ Name: "value", SQLType: schemas.SQLType{ Name: "LONGTEXT", @@ -39,7 +41,7 @@ func UseLongTextInSomeColumnsAndFixBugs(x base.EngineMigration) error { return err } - return base.ModifyColumn(x, "notice", &schemas.Column{ + return base.ModifyColumn(ctx, x, "notice", &schemas.Column{ Name: "description", SQLType: schemas.SQLType{ Name: "LONGTEXT", diff --git a/modelmigration/v1_25/v321_test.go b/modelmigration/v1_25/v321_test.go index 18aaef90760..480f2106866 100644 --- a/modelmigration/v1_25/v321_test.go +++ b/modelmigration/v1_25/v321_test.go @@ -47,7 +47,7 @@ func Test_UseLongTextInSomeColumnsAndFixBugs(t *testing.T) { x, deferrable := migrationtest.PrepareTestEnv(t, 0, new(ReviewState), new(PackageProperty), new(Notice)) defer deferrable() - require.NoError(t, UseLongTextInSomeColumnsAndFixBugs(x)) + require.NoError(t, UseLongTextInSomeColumnsAndFixBugs(t.Context(), x)) tables := migrationtest.LoadTableSchemasMap(t, x) table := tables["review_state"] diff --git a/modelmigration/v1_25/v322.go b/modelmigration/v1_25/v322.go index 66110c297d6..41849ff7752 100644 --- a/modelmigration/v1_25/v322.go +++ b/modelmigration/v1_25/v322.go @@ -4,18 +4,20 @@ package v1_25 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm/schemas" ) -func ExtendCommentTreePathLength(x base.EngineMigration) error { +func ExtendCommentTreePathLength(ctx context.Context, x base.EngineMigration) error { dbType := x.Dialect().URI().DBType if dbType == schemas.SQLITE { // For SQLITE, varchar or char will always be represented as TEXT return nil } - return base.ModifyColumn(x, "comment", &schemas.Column{ + return base.ModifyColumn(ctx, x, "comment", &schemas.Column{ Name: "tree_path", SQLType: schemas.SQLType{ Name: "VARCHAR", diff --git a/modelmigration/v1_25/v322_test.go b/modelmigration/v1_25/v322_test.go index fd1f7b22333..b7bb79ebd5f 100644 --- a/modelmigration/v1_25/v322_test.go +++ b/modelmigration/v1_25/v322_test.go @@ -26,7 +26,7 @@ func Test_ExtendCommentTreePathLength(t *testing.T) { x, deferrable := migrationtest.PrepareTestEnv(t, 0, new(Comment)) defer deferrable() - require.NoError(t, ExtendCommentTreePathLength(x)) + require.NoError(t, ExtendCommentTreePathLength(t.Context(), x)) table := migrationtest.LoadTableSchemasMap(t, x)["comment"] column := table.GetColumn("tree_path") assert.Contains(t, []string{"NVARCHAR", "VARCHAR"}, column.SQLType.Name) diff --git a/modelmigration/v1_26/v323.go b/modelmigration/v1_26/v323.go index fe244878e99..f70cebe4b3a 100644 --- a/modelmigration/v1_26/v323.go +++ b/modelmigration/v1_26/v323.go @@ -4,12 +4,14 @@ package v1_26 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddActionsConcurrency(x base.EngineMigration) error { +func AddActionsConcurrency(_ context.Context, x base.EngineMigration) error { type ActionRun struct { RepoID int64 `xorm:"index(repo_concurrency)"` RawConcurrency string diff --git a/modelmigration/v1_26/v324.go b/modelmigration/v1_26/v324.go index 9f086f96f0b..b115d200c25 100644 --- a/modelmigration/v1_26/v324.go +++ b/modelmigration/v1_26/v324.go @@ -4,12 +4,13 @@ package v1_26 import ( + "context" "fmt" "gitea.dev/modelmigration/base" ) -func FixClosedMilestoneCompleteness(x base.EngineMigration) error { +func FixClosedMilestoneCompleteness(_ context.Context, x base.EngineMigration) error { // Update all milestones to recalculate completeness with the new logic: // - Closed milestones with 0 issues should show 100% // - All other milestones should calculate based on closed/total ratio diff --git a/modelmigration/v1_26/v325.go b/modelmigration/v1_26/v325.go index f4dc8a537df..0e812bcb701 100644 --- a/modelmigration/v1_26/v325.go +++ b/modelmigration/v1_26/v325.go @@ -3,9 +3,13 @@ package v1_26 -import "gitea.dev/modelmigration/base" +import ( + "context" -func FixMissedRepoIDWhenMigrateAttachments(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func FixMissedRepoIDWhenMigrateAttachments(_ context.Context, x base.EngineMigration) error { _, err := x.Exec("UPDATE `attachment` SET `repo_id` = (SELECT `repo_id` FROM `issue` WHERE `issue`.`id` = `attachment`.`issue_id`) WHERE `issue_id` > 0 AND (`repo_id` IS NULL OR `repo_id` = 0);") if err != nil { return err diff --git a/modelmigration/v1_26/v325_test.go b/modelmigration/v1_26/v325_test.go index 882b9e2c466..c593bb626cb 100644 --- a/modelmigration/v1_26/v325_test.go +++ b/modelmigration/v1_26/v325_test.go @@ -41,5 +41,5 @@ func Test_FixMissedRepoIDWhenMigrateAttachments(t *testing.T) { x, deferrable := migrationtest.PrepareTestEnv(t, 0, new(Attachment), new(Issue), new(Release)) defer deferrable() - require.NoError(t, FixMissedRepoIDWhenMigrateAttachments(x)) + require.NoError(t, FixMissedRepoIDWhenMigrateAttachments(t.Context(), x)) } diff --git a/modelmigration/v1_26/v326.go b/modelmigration/v1_26/v326.go index b93e74002ef..4d8b432d01a 100644 --- a/modelmigration/v1_26/v326.go +++ b/modelmigration/v1_26/v326.go @@ -4,6 +4,7 @@ package v1_26 import ( + "context" "errors" "fmt" "net/url" @@ -91,7 +92,7 @@ type commitSHAAndRuns struct { // Only rows whose resolved run ID is below legacyURLIDThreshold are rewritten. // This is because smaller legacy run indexes are more likely to collide with run ID URLs during runtime resolution, // so this migration prioritizes that lower range and leaves the remaining legacy target URLs to the web compatibility logic. -func FixCommitStatusTargetURLToUseRunAndJobID(x base.EngineMigration) error { +func FixCommitStatusTargetURLToUseRunAndJobID(_ context.Context, x base.EngineMigration) error { jobsByRunIDCache := make(map[int64][]int64) repoLinkCache := make(map[int64]string) groups, err := loadLegacyMigrationRunGroups(x) diff --git a/modelmigration/v1_26/v326_test.go b/modelmigration/v1_26/v326_test.go index ba07cff909b..7093714914c 100644 --- a/modelmigration/v1_26/v326_test.go +++ b/modelmigration/v1_26/v326_test.go @@ -62,7 +62,7 @@ func Test_FixCommitStatusTargetURLToUseRunAndJobID(t *testing.T) { ) defer deferable() - require.NoError(t, FixCommitStatusTargetURLToUseRunAndJobID(x)) + require.NoError(t, FixCommitStatusTargetURLToUseRunAndJobID(t.Context(), x)) cases := []struct { table string diff --git a/modelmigration/v1_26/v327.go b/modelmigration/v1_26/v327.go index a4ac3e9db2a..5153e1b0f33 100644 --- a/modelmigration/v1_26/v327.go +++ b/modelmigration/v1_26/v327.go @@ -4,12 +4,14 @@ package v1_26 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddDisabledToActionRunner(x base.EngineMigration) error { +func AddDisabledToActionRunner(_ context.Context, x base.EngineMigration) error { type ActionRunner struct { IsDisabled bool `xorm:"is_disabled NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_26/v327_test.go b/modelmigration/v1_26/v327_test.go index db5ca09c8e0..4b9bb6d22a7 100644 --- a/modelmigration/v1_26/v327_test.go +++ b/modelmigration/v1_26/v327_test.go @@ -23,7 +23,7 @@ func Test_AddDisabledToActionRunner(t *testing.T) { _, err := x.Insert(&ActionRunner{Name: "runner"}) require.NoError(t, err) - require.NoError(t, AddDisabledToActionRunner(x)) + require.NoError(t, AddDisabledToActionRunner(t.Context(), x)) var isDisabled bool has, err := x.SQL("SELECT is_disabled FROM action_runner WHERE id = ?", 1).Get(&isDisabled) diff --git a/modelmigration/v1_26/v328.go b/modelmigration/v1_26/v328.go index c91bd5206ed..a2bb8c0b0e1 100644 --- a/modelmigration/v1_26/v328.go +++ b/modelmigration/v1_26/v328.go @@ -4,12 +4,14 @@ package v1_26 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddTokenPermissionsToActionRunJob(x base.EngineMigration) error { +func AddTokenPermissionsToActionRunJob(_ context.Context, x base.EngineMigration) error { type ActionRunJob struct { TokenPermissions string `xorm:"JSON TEXT"` } diff --git a/modelmigration/v1_26/v329.go b/modelmigration/v1_26/v329.go index dac732c9d4c..7319d12e8ae 100644 --- a/modelmigration/v1_26/v329.go +++ b/modelmigration/v1_26/v329.go @@ -4,6 +4,7 @@ package v1_26 import ( + "context" "fmt" "gitea.dev/modelmigration/base" @@ -28,7 +29,7 @@ func (n *UserBadge) TableIndices() []*schemas.Index { // AddUniqueIndexForUserBadge adds a compound unique indexes for user badge table // and it replaces an old index on user_id -func AddUniqueIndexForUserBadge(x base.EngineMigration) error { +func AddUniqueIndexForUserBadge(_ context.Context, x base.EngineMigration) error { // remove possible duplicated records in table user_badge type result struct { UserID int64 diff --git a/modelmigration/v1_26/v329_test.go b/modelmigration/v1_26/v329_test.go index 6f8d4417d37..d627030ebe2 100644 --- a/modelmigration/v1_26/v329_test.go +++ b/modelmigration/v1_26/v329_test.go @@ -56,7 +56,7 @@ func Test_AddUniqueIndexForUserBadge(t *testing.T) { assert.Equal(t, int64(6), totalCount) // run the migration - if err := AddUniqueIndexForUserBadge(x); err != nil { + if err := AddUniqueIndexForUserBadge(t.Context(), x); err != nil { assert.NoError(t, err) return } diff --git a/modelmigration/v1_26/v330.go b/modelmigration/v1_26/v330.go index 37087e88d81..cfda7591c84 100644 --- a/modelmigration/v1_26/v330.go +++ b/modelmigration/v1_26/v330.go @@ -4,12 +4,14 @@ package v1_26 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddNameToWebhook(x base.EngineMigration) error { +func AddNameToWebhook(_ context.Context, x base.EngineMigration) error { type Webhook struct { Name string `xorm:"VARCHAR(255) NOT NULL DEFAULT ''"` } diff --git a/modelmigration/v1_27/v331.go b/modelmigration/v1_27/v331.go index eeba5f64606..b69708f5c69 100644 --- a/modelmigration/v1_27/v331.go +++ b/modelmigration/v1_27/v331.go @@ -90,7 +90,7 @@ func (actionRun) TableName() string { } // AddActionRunAttemptModel adds the ActionRunAttempt table and the supporting ActionRun/ActionRunJob fields. -func AddActionRunAttemptModel(x base.EngineMigration) error { +func AddActionRunAttemptModel(ctx context.Context, x base.EngineMigration) error { // add "action_run_attempt" if _, err := x.SyncWithOptions(xorm.SyncOptions{ IgnoreDropIndices: true, @@ -136,7 +136,7 @@ func AddActionRunAttemptModel(x base.EngineMigration) error { } concurrencyColumns := make([]string, 0, 2) for _, col := range []string{"concurrency_group", "concurrency_cancel"} { - exist, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "action_run", col) + exist, err := x.Dialect().IsColumnExist(x.DB(), ctx, "action_run", col) if err != nil { return err } diff --git a/modelmigration/v1_27/v331_test.go b/modelmigration/v1_27/v331_test.go index 883cb7afb4d..05ab100605e 100644 --- a/modelmigration/v1_27/v331_test.go +++ b/modelmigration/v1_27/v331_test.go @@ -4,7 +4,6 @@ package v1_27 import ( - "context" "slices" "testing" @@ -67,7 +66,7 @@ func Test_AddActionRunAttemptModel(t *testing.T) { }) require.NoError(t, err) - require.NoError(t, AddActionRunAttemptModel(x)) + require.NoError(t, AddActionRunAttemptModel(t.Context(), x)) tableMap := migrationtest.LoadTableSchemasMap(t, x) @@ -88,22 +87,22 @@ func Test_AddActionRunAttemptModel(t *testing.T) { require.Contains(t, jobTable.ColumnsSeq(), "attempt_job_id") require.Contains(t, jobTable.ColumnsSeq(), "source_task_id") - attemptIndexes, err := x.Dialect().GetIndexes(x.DB(), context.Background(), "action_run_attempt") + attemptIndexes, err := x.Dialect().GetIndexes(x.DB(), t.Context(), "action_run_attempt") require.NoError(t, err) assert.True(t, hasIndexWithColumns(attemptIndexes, []string{"run_id", "attempt"}, true)) assert.True(t, hasIndexWithColumns(attemptIndexes, []string{"repo_id", "concurrency_group", "status"}, false)) - runIndexes, err := x.Dialect().GetIndexes(x.DB(), context.Background(), "action_run") + runIndexes, err := x.Dialect().GetIndexes(x.DB(), t.Context(), "action_run") require.NoError(t, err) assert.True(t, hasIndexWithColumns(runIndexes, []string{"latest_attempt_id"}, false)) assert.False(t, hasIndexWithColumns(runIndexes, []string{"repo_id", "concurrency_group"}, false)) - jobIndexes, err := x.Dialect().GetIndexes(x.DB(), context.Background(), "action_run_job") + jobIndexes, err := x.Dialect().GetIndexes(x.DB(), t.Context(), "action_run_job") require.NoError(t, err) assert.True(t, hasIndexWithColumns(jobIndexes, []string{"run_attempt_id"}, false)) assert.True(t, hasIndexWithColumns(jobIndexes, []string{"attempt_job_id"}, false)) - indexes, err := x.Dialect().GetIndexes(x.DB(), context.Background(), "action_artifact") + indexes, err := x.Dialect().GetIndexes(x.DB(), t.Context(), "action_artifact") require.NoError(t, err) assert.False(t, hasIndexWithColumns(indexes, []string{"run_id", "artifact_path", "artifact_name"}, true)) assert.True(t, hasIndexWithColumns(indexes, []string{"run_id", "run_attempt_id", "artifact_path", "artifact_name"}, true)) diff --git a/modelmigration/v1_27/v332.go b/modelmigration/v1_27/v332.go index 2558b2cf207..0c836d52041 100644 --- a/modelmigration/v1_27/v332.go +++ b/modelmigration/v1_27/v332.go @@ -4,6 +4,8 @@ package v1_27 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" @@ -17,7 +19,7 @@ func (mirrorWithLastSyncUnix) TableName() string { return "mirror" } -func AddLastSyncUnixToMirror(x base.EngineMigration) error { +func AddLastSyncUnixToMirror(_ context.Context, x base.EngineMigration) error { _, err := x.SyncWithOptions(xorm.SyncOptions{ IgnoreDropIndices: true, }, new(mirrorWithLastSyncUnix)) diff --git a/modelmigration/v1_27/v333.go b/modelmigration/v1_27/v333.go index 9680af58927..c33883a5471 100644 --- a/modelmigration/v1_27/v333.go +++ b/modelmigration/v1_27/v333.go @@ -4,12 +4,14 @@ package v1_27 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddBranchProtectionBypassAllowlist(x base.EngineMigration) error { +func AddBranchProtectionBypassAllowlist(_ context.Context, x base.EngineMigration) error { type ProtectedBranch struct { EnableBypassAllowlist bool `xorm:"NOT NULL DEFAULT false"` BypassAllowlistUserIDs []int64 `xorm:"JSON TEXT"` diff --git a/modelmigration/v1_27/v333_test.go b/modelmigration/v1_27/v333_test.go index 6a9ccc090f3..701a3311f47 100644 --- a/modelmigration/v1_27/v333_test.go +++ b/modelmigration/v1_27/v333_test.go @@ -38,7 +38,7 @@ func Test_AddBranchProtectionBypassAllowlist(t *testing.T) { }) require.NoError(t, err) - require.NoError(t, AddBranchProtectionBypassAllowlist(x)) + require.NoError(t, AddBranchProtectionBypassAllowlist(t.Context(), x)) // Verify the default values record var pb ProtectedBranch diff --git a/modelmigration/v1_27/v334.go b/modelmigration/v1_27/v334.go index 38cd9aeaa73..691a3226cc4 100644 --- a/modelmigration/v1_27/v334.go +++ b/modelmigration/v1_27/v334.go @@ -4,12 +4,14 @@ package v1_27 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddCancellingSupportToActionRunner(x base.EngineMigration) error { +func AddCancellingSupportToActionRunner(_ context.Context, x base.EngineMigration) error { type ActionRunner struct { HasCancellingSupport bool `xorm:"has_cancelling_support NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_27/v334_test.go b/modelmigration/v1_27/v334_test.go index 85fd911d29b..832d2fbe0b9 100644 --- a/modelmigration/v1_27/v334_test.go +++ b/modelmigration/v1_27/v334_test.go @@ -26,7 +26,7 @@ func TestAddCancellingSupportToActionRunner(t *testing.T) { _, err := x.Insert(&ActionRunner{Name: "runner"}) require.NoError(t, err) - require.NoError(t, AddCancellingSupportToActionRunner(x)) + require.NoError(t, AddCancellingSupportToActionRunner(t.Context(), x)) var hasCancellingSupport bool has, err := x.SQL("SELECT has_cancelling_support FROM action_runner WHERE id = ?", 1).Get(&hasCancellingSupport) diff --git a/modelmigration/v1_27/v335.go b/modelmigration/v1_27/v335.go index e0d12ff50fd..2275e1634ec 100644 --- a/modelmigration/v1_27/v335.go +++ b/modelmigration/v1_27/v335.go @@ -4,6 +4,8 @@ package v1_27 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" @@ -11,7 +13,7 @@ import ( // AddReusableWorkflowFieldsToActionRunJob adds the ActionRunJob columns that describe the reusable workflow caller hierarchy, // and the ActionRunAttemptJobIDIndex table backing run-wide AttemptJobID allocation. -func AddReusableWorkflowFieldsToActionRunJob(x base.EngineMigration) error { +func AddReusableWorkflowFieldsToActionRunJob(_ context.Context, x base.EngineMigration) error { type ActionRunJob struct { WorkflowSourceRepoID int64 `xorm:"NOT NULL DEFAULT 0"` WorkflowSourceCommitSHA string `xorm:"VARCHAR(64) NOT NULL DEFAULT ''"` diff --git a/modelmigration/v1_27/v336.go b/modelmigration/v1_27/v336.go index 7303f605a5e..712ff31f61e 100644 --- a/modelmigration/v1_27/v336.go +++ b/modelmigration/v1_27/v336.go @@ -4,11 +4,13 @@ package v1_27 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddActionRunJobSummaryTable(x base.EngineMigration) error { +func AddActionRunJobSummaryTable(_ context.Context, x base.EngineMigration) error { type ActionRunJobSummary struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_27/v337.go b/modelmigration/v1_27/v337.go index 7c89337cb1a..8586482cbc5 100644 --- a/modelmigration/v1_27/v337.go +++ b/modelmigration/v1_27/v337.go @@ -4,6 +4,8 @@ package v1_27 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" @@ -19,7 +21,7 @@ func (teamWithVisibility) TableName() string { return "team" } -func AddVisibilityToTeam(x base.EngineMigration) error { +func AddVisibilityToTeam(_ context.Context, x base.EngineMigration) error { if _, err := x.SyncWithOptions(xorm.SyncOptions{ IgnoreDropIndices: true, IgnoreConstrains: true, diff --git a/modelmigration/v1_27/v338.go b/modelmigration/v1_27/v338.go index 322d8b6e19e..55af1c358ef 100644 --- a/modelmigration/v1_27/v338.go +++ b/modelmigration/v1_27/v338.go @@ -4,6 +4,7 @@ package v1_27 import ( + "context" "fmt" "strings" @@ -36,7 +37,7 @@ func isMSSQLMaxTextColumn(column *schemas.Column) bool { return strings.EqualFold(column.SQLType.Name, schemas.Varchar) || strings.EqualFold(column.SQLType.Name, schemas.NVarchar) } -func modifyLongTextColumnsForMSSQL(x base.EngineMigration, bean any, columnNames ...string) error { +func modifyLongTextColumnsForMSSQL(ctx context.Context, x base.EngineMigration, bean any, columnNames ...string) error { table, err := x.TableInfo(bean) if err != nil { return err @@ -50,7 +51,7 @@ func modifyLongTextColumnsForMSSQL(x base.EngineMigration, bean any, columnNames if isMSSQLMaxTextColumn(column) { continue } - if err := base.ModifyColumn(x, table.Name, column); err != nil { + if err := base.ModifyColumn(ctx, x, table.Name, column); err != nil { return fmt.Errorf("modify %s.%s: %w", table.Name, columnName, err) } } @@ -60,13 +61,13 @@ func modifyLongTextColumnsForMSSQL(x base.EngineMigration, bean any, columnNames // ExpandIssueAndCommentLongTextFieldsForMSSQL expands legacy MSSQL nvarchar(4000) // columns to nvarchar(max) so PR push comments and long issue content are not truncated. -func ExpandIssueAndCommentLongTextFieldsForMSSQL(x base.EngineMigration) error { +func ExpandIssueAndCommentLongTextFieldsForMSSQL(ctx context.Context, x base.EngineMigration) error { if x.Dialect().URI().DBType != schemas.MSSQL { return nil } - if err := modifyLongTextColumnsForMSSQL(x, new(issueWithLongTextContent), "content"); err != nil { + if err := modifyLongTextColumnsForMSSQL(ctx, x, new(issueWithLongTextContent), "content"); err != nil { return err } - return modifyLongTextColumnsForMSSQL(x, new(commentWithLongTextFields), "content", "patch") + return modifyLongTextColumnsForMSSQL(ctx, x, new(commentWithLongTextFields), "content", "patch") } diff --git a/modelmigration/v1_27/v338_test.go b/modelmigration/v1_27/v338_test.go index c0370ef6577..c34ff660cb1 100644 --- a/modelmigration/v1_27/v338_test.go +++ b/modelmigration/v1_27/v338_test.go @@ -40,8 +40,8 @@ func Test_ExpandIssueAndCommentLongTextFieldsForMSSQL(t *testing.T) { x, deferrable := migrationtest.PrepareTestEnv(t, 0, new(issueBeforeLongTextMSSQLMigration), new(commentBeforeLongTextMSSQLMigration)) defer deferrable() - require.NoError(t, ExpandIssueAndCommentLongTextFieldsForMSSQL(x)) - require.NoError(t, ExpandIssueAndCommentLongTextFieldsForMSSQL(x)) + require.NoError(t, ExpandIssueAndCommentLongTextFieldsForMSSQL(t.Context(), x)) + require.NoError(t, ExpandIssueAndCommentLongTextFieldsForMSSQL(t.Context(), x)) longText := strings.Repeat("x", 5000) _, err := x.Insert(&issueBeforeLongTextMSSQLMigration{Content: longText}) diff --git a/modelmigration/v1_27/v339.go b/modelmigration/v1_27/v339.go index 9da1cf0f53a..59ccd40745a 100644 --- a/modelmigration/v1_27/v339.go +++ b/modelmigration/v1_27/v339.go @@ -14,11 +14,11 @@ import ( // AddCreatedUnixToActionUserIsDeletedIndex extends the c_u composite index on // the action table to include created_unix, enabling efficient ORDER BY on the // dashboard feed query without a full sort of all matching rows. -func AddCreatedUnixToActionUserIsDeletedIndex(x base.EngineMigration) error { +func AddCreatedUnixToActionUserIsDeletedIndex(ctx context.Context, x base.EngineMigration) error { // xorm Sync cannot reliably update an index when another index already // covers the same columns in a different order (Equal() is order-insensitive). // Drop the old c_u index explicitly, then recreate it with the new column set. - indexes, err := x.Dialect().GetIndexes(x.DB(), context.Background(), "action") + indexes, err := x.Dialect().GetIndexes(x.DB(), ctx, "action") if err != nil { return err } diff --git a/modelmigration/v1_27/v339_test.go b/modelmigration/v1_27/v339_test.go index ab20553ab30..9fbc1b312b3 100644 --- a/modelmigration/v1_27/v339_test.go +++ b/modelmigration/v1_27/v339_test.go @@ -4,7 +4,6 @@ package v1_27 import ( - "context" "testing" "gitea.dev/modelmigration/migrationtest" @@ -58,14 +57,14 @@ func Test_AddCreatedUnixToActionUserIsDeletedIndex(t *testing.T) { return } - indexes, err := x.Dialect().GetIndexes(x.DB(), context.Background(), "action") + indexes, err := x.Dialect().GetIndexes(x.DB(), t.Context(), "action") require.NoError(t, err) assert.True(t, hasIndexWithColumns(indexes, []string{"user_id", "is_deleted"}, false), "old c_u index should exist before migration") assert.False(t, hasIndexWithColumns(indexes, []string{"user_id", "is_deleted", "created_unix"}, false), "new c_u index should not exist before migration") - require.NoError(t, AddCreatedUnixToActionUserIsDeletedIndex(x)) + require.NoError(t, AddCreatedUnixToActionUserIsDeletedIndex(t.Context(), x)) - indexes, err = x.Dialect().GetIndexes(x.DB(), context.Background(), "action") + indexes, err = x.Dialect().GetIndexes(x.DB(), t.Context(), "action") require.NoError(t, err) assert.False(t, hasIndexWithColumns(indexes, []string{"user_id", "is_deleted"}, false), "old 2-column c_u index should be gone after migration") assert.True(t, hasIndexWithColumns(indexes, []string{"user_id", "is_deleted", "created_unix"}, false), "new 3-column c_u index must exist after migration") diff --git a/modelmigration/v1_27/v340.go b/modelmigration/v1_27/v340.go index 95ef5961b86..4ea17be73cc 100644 --- a/modelmigration/v1_27/v340.go +++ b/modelmigration/v1_27/v340.go @@ -4,6 +4,8 @@ package v1_27 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" @@ -11,7 +13,7 @@ import ( // AddContinueOnErrorToActionRunJob adds the ContinueOnError column to ActionRunJob, // storing the job-level continue-on-error value from the workflow YAML. -func AddContinueOnErrorToActionRunJob(x base.EngineMigration) error { +func AddContinueOnErrorToActionRunJob(_ context.Context, x base.EngineMigration) error { type ActionRunJob struct { ContinueOnError bool `xorm:"NOT NULL DEFAULT FALSE"` } diff --git a/modelmigration/v1_27/v341.go b/modelmigration/v1_27/v341.go index 0451e4dafbd..3e0f00a157f 100644 --- a/modelmigration/v1_27/v341.go +++ b/modelmigration/v1_27/v341.go @@ -4,6 +4,7 @@ package v1_27 import ( + "context" "fmt" "strings" "time" @@ -46,7 +47,7 @@ func (lfsLockWithCreated) TableName() string { // when the MSSQL session language is not English, breaking external account // linking and LFS lock creation. New installs already use DATETIME2, so only // legacy MSSQL columns need converting. -func FixLegacyMSSQLDateTimeColumns(x base.EngineMigration) error { +func FixLegacyMSSQLDateTimeColumns(ctx context.Context, x base.EngineMigration) error { if x.Dialect().URI().DBType != schemas.MSSQL { return nil } @@ -70,7 +71,7 @@ func FixLegacyMSSQLDateTimeColumns(x base.EngineMigration) error { if column == nil { return fmt.Errorf("column %s does not exist in table %s", c.column, table.Name) } - if err := base.ModifyColumn(x, table.Name, column); err != nil { + if err := base.ModifyColumn(ctx, x, table.Name, column); err != nil { return fmt.Errorf("modify %s.%s: %w", table.Name, c.column, err) } } diff --git a/modelmigration/v1_27/v341_test.go b/modelmigration/v1_27/v341_test.go index bd5d4bc8a09..805d4615b27 100644 --- a/modelmigration/v1_27/v341_test.go +++ b/modelmigration/v1_27/v341_test.go @@ -52,8 +52,8 @@ func Test_FixLegacyMSSQLDateTimeColumns(t *testing.T) { require.Equal(t, "datetime", mssqlColumnType(t, x, "external_login_user", "expires_at")) require.Equal(t, "datetime", mssqlColumnType(t, x, "lfs_lock", "created")) - require.NoError(t, FixLegacyMSSQLDateTimeColumns(x)) - require.NoError(t, FixLegacyMSSQLDateTimeColumns(x)) // idempotent + require.NoError(t, FixLegacyMSSQLDateTimeColumns(t.Context(), x)) + require.NoError(t, FixLegacyMSSQLDateTimeColumns(t.Context(), x)) // idempotent require.Equal(t, "datetime2", mssqlColumnType(t, x, "external_login_user", "expires_at")) require.Equal(t, "datetime2", mssqlColumnType(t, x, "lfs_lock", "created")) diff --git a/modelmigration/v1_27/v342.go b/modelmigration/v1_27/v342.go index c5cc9a34d68..a3a1dbd7adb 100644 --- a/modelmigration/v1_27/v342.go +++ b/modelmigration/v1_27/v342.go @@ -4,13 +4,15 @@ package v1_27 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" "xorm.io/xorm" ) -func AddScopedWorkflowsSchema(x base.EngineMigration) error { +func AddScopedWorkflowsSchema(_ context.Context, x base.EngineMigration) error { // Create the action_scoped_workflow_source table type ScopedWorkflowConfig struct { Required bool `json:"required"` diff --git a/modelmigration/v1_28/v343.go b/modelmigration/v1_28/v343.go index 9b72617c718..b6d20c9a70e 100644 --- a/modelmigration/v1_28/v343.go +++ b/modelmigration/v1_28/v343.go @@ -4,12 +4,14 @@ package v1_28 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) -func AddMaxParallelToActionRunJob(x base.EngineMigration) error { +func AddMaxParallelToActionRunJob(_ context.Context, x base.EngineMigration) error { type ActionRunJob struct { MaxParallel int `xorm:"NOT NULL DEFAULT 0"` } diff --git a/modelmigration/v1_28/v343_test.go b/modelmigration/v1_28/v343_test.go index 4eb3e7ffdec..28588a86daa 100644 --- a/modelmigration/v1_28/v343_test.go +++ b/modelmigration/v1_28/v343_test.go @@ -26,7 +26,7 @@ func TestAddMaxParallelToActionRunJob(t *testing.T) { _, err := x.Insert(&ActionRunJob{Name: "job-a"}) require.NoError(t, err) - require.NoError(t, AddMaxParallelToActionRunJob(x)) + require.NoError(t, AddMaxParallelToActionRunJob(t.Context(), x)) // pre-existing rows must default to unlimited var maxParallel int diff --git a/modelmigration/v1_28/v344.go b/modelmigration/v1_28/v344.go index 1820aec57a9..5a7ad8d8038 100644 --- a/modelmigration/v1_28/v344.go +++ b/modelmigration/v1_28/v344.go @@ -4,13 +4,15 @@ package v1_28 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) // AddDeferredMatrixColumnsToActionRunJob adds the columns backing deferred (dynamic) matrix expansion -func AddDeferredMatrixColumnsToActionRunJob(x base.EngineMigration) error { +func AddDeferredMatrixColumnsToActionRunJob(_ context.Context, x base.EngineMigration) error { type ActionRunJob struct { // IsMatrixDeferred marks jobs whose matrix depends on other jobs' outputs and is therefore expanded only once those jobs finish; IsMatrixDeferred bool `xorm:"NOT NULL DEFAULT FALSE"` diff --git a/modelmigration/v1_28/v345.go b/modelmigration/v1_28/v345.go index 914e2940b0e..bdc9a6236d3 100644 --- a/modelmigration/v1_28/v345.go +++ b/modelmigration/v1_28/v345.go @@ -4,13 +4,15 @@ package v1_28 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/xorm" ) // AddBlockOnCodeownerReviews adds block on codeowner reviews branch protection -func AddBlockOnCodeownerReviews(x base.EngineMigration) error { +func AddBlockOnCodeownerReviews(_ context.Context, x base.EngineMigration) error { type ProtectedBranch struct { BlockOnCodeownerReviews bool `xorm:"NOT NULL DEFAULT false"` } diff --git a/modelmigration/v1_6/v70.go b/modelmigration/v1_6/v70.go index e211711714f..37199e38ac9 100644 --- a/modelmigration/v1_6/v70.go +++ b/modelmigration/v1_6/v70.go @@ -4,6 +4,7 @@ package v1_6 import ( + "context" "fmt" "time" @@ -11,7 +12,7 @@ import ( "gitea.dev/modules/setting" ) -func AddIssueDependencies(x base.EngineMigration) (err error) { +func AddIssueDependencies(_ context.Context, x base.EngineMigration) (err error) { type IssueDependency struct { ID int64 `xorm:"pk autoincr"` UserID int64 `xorm:"NOT NULL"` diff --git a/modelmigration/v1_6/v71.go b/modelmigration/v1_6/v71.go index 8235e962a2f..b7459e77a72 100644 --- a/modelmigration/v1_6/v71.go +++ b/modelmigration/v1_6/v71.go @@ -4,6 +4,7 @@ package v1_6 import ( + "context" "fmt" "gitea.dev/modelmigration/base" @@ -11,7 +12,7 @@ import ( "gitea.dev/modules/util" ) -func AddScratchHash(x base.EngineMigration) error { +func AddScratchHash(_ context.Context, x base.EngineMigration) error { // TwoFactor see models/twofactor.go type TwoFactor struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_6/v72.go b/modelmigration/v1_6/v72.go index d1bee6174cb..81bd6ea2a5f 100644 --- a/modelmigration/v1_6/v72.go +++ b/modelmigration/v1_6/v72.go @@ -4,13 +4,14 @@ package v1_6 import ( + "context" "fmt" "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddReview(x base.EngineMigration) error { +func AddReview(_ context.Context, x base.EngineMigration) error { // Review see models/review.go type Review struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_7/v73.go b/modelmigration/v1_7/v73.go index d98b3982bd1..6a3865ade16 100644 --- a/modelmigration/v1_7/v73.go +++ b/modelmigration/v1_7/v73.go @@ -3,9 +3,13 @@ package v1_7 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddMustChangePassword(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddMustChangePassword(_ context.Context, x base.EngineMigration) error { // User see models/user.go type User struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_7/v74.go b/modelmigration/v1_7/v74.go index 2993dda3a50..c11587324b8 100644 --- a/modelmigration/v1_7/v74.go +++ b/modelmigration/v1_7/v74.go @@ -3,9 +3,13 @@ package v1_7 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddApprovalWhitelistsToProtectedBranches(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddApprovalWhitelistsToProtectedBranches(_ context.Context, x base.EngineMigration) error { type ProtectedBranch struct { ApprovalsWhitelistUserIDs []int64 `xorm:"JSON TEXT"` ApprovalsWhitelistTeamIDs []int64 `xorm:"JSON TEXT"` diff --git a/modelmigration/v1_7/v75.go b/modelmigration/v1_7/v75.go index 8ffaaf19432..93cf412a056 100644 --- a/modelmigration/v1_7/v75.go +++ b/modelmigration/v1_7/v75.go @@ -4,12 +4,14 @@ package v1_7 import ( + "context" + "gitea.dev/modelmigration/base" "xorm.io/builder" ) -func ClearNonusedData(x base.EngineMigration) error { +func ClearNonusedData(_ context.Context, x base.EngineMigration) error { condDelete := func(colName string) builder.Cond { return builder.NotIn(colName, builder.Select("id").From("`user`")) } diff --git a/modelmigration/v1_8/v76.go b/modelmigration/v1_8/v76.go index b40fb9b2d0b..d666dcef494 100644 --- a/modelmigration/v1_8/v76.go +++ b/modelmigration/v1_8/v76.go @@ -4,13 +4,14 @@ package v1_8 import ( + "context" "fmt" "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddPullRequestRebaseWithMerge(x base.EngineMigration) error { +func AddPullRequestRebaseWithMerge(_ context.Context, x base.EngineMigration) error { // RepoUnit describes all units of a repository type RepoUnit struct { ID int64 diff --git a/modelmigration/v1_8/v77.go b/modelmigration/v1_8/v77.go index a7b456d95c4..a611eed1044 100644 --- a/modelmigration/v1_8/v77.go +++ b/modelmigration/v1_8/v77.go @@ -3,9 +3,13 @@ package v1_8 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddUserDefaultTheme(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddUserDefaultTheme(_ context.Context, x base.EngineMigration) error { type User struct { Theme string `xorm:"VARCHAR(30) NOT NULL DEFAULT ''"` } diff --git a/modelmigration/v1_8/v78.go b/modelmigration/v1_8/v78.go index beb51c345af..ff09e6e2db2 100644 --- a/modelmigration/v1_8/v78.go +++ b/modelmigration/v1_8/v78.go @@ -4,10 +4,12 @@ package v1_8 import ( + "context" + "gitea.dev/modelmigration/base" ) -func RenameRepoIsBareToIsEmpty(x base.EngineMigration) error { +func RenameRepoIsBareToIsEmpty(_ context.Context, x base.EngineMigration) error { type Repository struct { ID int64 `xorm:"pk autoincr"` IsBare bool diff --git a/modelmigration/v1_8/v79.go b/modelmigration/v1_8/v79.go index c08711ae8bc..db7415b7f46 100644 --- a/modelmigration/v1_8/v79.go +++ b/modelmigration/v1_8/v79.go @@ -4,11 +4,13 @@ package v1_8 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/setting" ) -func AddCanCloseIssuesViaCommitInAnyBranch(x base.EngineMigration) error { +func AddCanCloseIssuesViaCommitInAnyBranch(_ context.Context, x base.EngineMigration) error { type Repository struct { ID int64 `xorm:"pk autoincr"` CloseIssuesViaCommitInAnyBranch bool `xorm:"NOT NULL DEFAULT false"` diff --git a/modelmigration/v1_8/v80.go b/modelmigration/v1_8/v80.go index 7b383826912..9239de7f52a 100644 --- a/modelmigration/v1_8/v80.go +++ b/modelmigration/v1_8/v80.go @@ -3,9 +3,13 @@ package v1_8 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddIsLockedToIssues(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddIsLockedToIssues(_ context.Context, x base.EngineMigration) error { // Issue see models/issue.go type Issue struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_8/v81.go b/modelmigration/v1_8/v81.go index 50ef79f0bc5..8e963f98cc3 100644 --- a/modelmigration/v1_8/v81.go +++ b/modelmigration/v1_8/v81.go @@ -4,6 +4,7 @@ package v1_8 import ( + "context" "fmt" "gitea.dev/modelmigration/base" @@ -11,7 +12,7 @@ import ( "xorm.io/xorm/schemas" ) -func ChangeU2FCounterType(x base.EngineMigration) error { +func ChangeU2FCounterType(_ context.Context, x base.EngineMigration) error { var err error switch x.Dialect().URI().DBType { diff --git a/modelmigration/v1_9/v83.go b/modelmigration/v1_9/v83.go index e49bd99e270..d3743a8a2a6 100644 --- a/modelmigration/v1_9/v83.go +++ b/modelmigration/v1_9/v83.go @@ -4,11 +4,13 @@ package v1_9 import ( + "context" + "gitea.dev/modelmigration/base" "gitea.dev/modules/timeutil" ) -func AddUploaderIDForAttachment(x base.EngineMigration) error { +func AddUploaderIDForAttachment(_ context.Context, x base.EngineMigration) error { type Attachment struct { ID int64 `xorm:"pk autoincr"` UUID string `xorm:"uuid UNIQUE"` diff --git a/modelmigration/v1_9/v84.go b/modelmigration/v1_9/v84.go index 20cb78ef266..e3e72ef2b4c 100644 --- a/modelmigration/v1_9/v84.go +++ b/modelmigration/v1_9/v84.go @@ -3,9 +3,13 @@ package v1_9 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddGPGKeyImport(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddGPGKeyImport(_ context.Context, x base.EngineMigration) error { type GPGKeyImport struct { KeyID string `xorm:"pk CHAR(16) NOT NULL"` Content string `xorm:"TEXT NOT NULL"` diff --git a/modelmigration/v1_9/v85.go b/modelmigration/v1_9/v85.go index f54014c9031..66ebc1424c0 100644 --- a/modelmigration/v1_9/v85.go +++ b/modelmigration/v1_9/v85.go @@ -4,6 +4,7 @@ package v1_9 import ( + "context" "fmt" "gitea.dev/modelmigration/base" @@ -12,7 +13,7 @@ import ( "gitea.dev/modules/util" ) -func HashAppToken(x base.EngineMigration) error { +func HashAppToken(_ context.Context, x base.EngineMigration) error { // AccessToken see models/token.go type AccessToken struct { ID int64 `xorm:"pk autoincr"` diff --git a/modelmigration/v1_9/v86.go b/modelmigration/v1_9/v86.go index 20d1ed72a58..576146f4763 100644 --- a/modelmigration/v1_9/v86.go +++ b/modelmigration/v1_9/v86.go @@ -3,9 +3,13 @@ package v1_9 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddHTTPMethodToWebhook(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddHTTPMethodToWebhook(_ context.Context, x base.EngineMigration) error { type Webhook struct { HTTPMethod string `xorm:"http_method DEFAULT 'POST'"` } diff --git a/modelmigration/v1_9/v87.go b/modelmigration/v1_9/v87.go index 54f87bb6296..e30746a4635 100644 --- a/modelmigration/v1_9/v87.go +++ b/modelmigration/v1_9/v87.go @@ -3,9 +3,13 @@ package v1_9 -import "gitea.dev/modelmigration/base" +import ( + "context" -func AddAvatarFieldToRepository(x base.EngineMigration) error { + "gitea.dev/modelmigration/base" +) + +func AddAvatarFieldToRepository(_ context.Context, x base.EngineMigration) error { type Repository struct { // ID(10-20)-md5(32) - must fit into 64 symbols Avatar string `xorm:"VARCHAR(64)"`