feat: update gitea vendor

package/gitea/source/models/migrations/v1_14/main_test.go

@@ -6,9 +6,9 @@ package v1_14
 import (
 	"testing"
 
-	"code.gitea.io/gitea/models/migrations/base"
+	"gitea.dev/models/migrations/migrationtest"
 )
 
 func TestMain(m *testing.M) {
-	base.MainTest(m)
+	migrationtest.MainTest(m)
 }

package/gitea/source/models/migrations/v1_14/v155.go

@@ -6,10 +6,10 @@ package v1_14
 import (
 	"fmt"
 
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
 )
 
-func AddChangedProtectedFilesPullRequestColumn(x *xorm.Engine) error {
+func AddChangedProtectedFilesPullRequestColumn(x db.EngineMigration) error {
 	type PullRequest struct {
 		ChangedProtectedFiles []string `xorm:"TEXT JSON"`
 	}

package/gitea/source/models/migrations/v1_14/v156.go

@@ -9,11 +9,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	"code.gitea.io/gitea/modules/git"
-	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/setting"
-
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
+	"gitea.dev/modules/git"
+	"gitea.dev/modules/log"
+	"gitea.dev/modules/setting"
 )
 
 // Copy paste from models/repo.go because we cannot import models package
@@ -25,7 +24,7 @@ func userPath(userName string) string {
 	return filepath.Join(setting.RepoRootPath, strings.ToLower(userName))
 }
 
-func FixPublisherIDforTagReleases(ctx context.Context, x *xorm.Engine) error {
+func FixPublisherIDforTagReleases(ctx context.Context, x db.EngineMigration) error {
 	type Release struct {
 		ID          int64
 		RepoID      int64

package/gitea/source/models/migrations/v1_14/v157.go

@@ -3,11 +3,9 @@
 
 package v1_14
 
-import (
-	"xorm.io/xorm"
-)
+import "gitea.dev/models/db"
 
-func FixRepoTopics(x *xorm.Engine) error {
+func FixRepoTopics(x db.EngineMigration) error {
 	type Repository struct {
 		ID     int64    `xorm:"pk autoincr"`
 		Topics []string `xorm:"TEXT JSON"`

package/gitea/source/models/migrations/v1_14/v158.go

@@ -7,13 +7,12 @@ import (
 	"errors"
 	"strconv"
 
-	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/setting"
-
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
+	"gitea.dev/modules/log"
+	"gitea.dev/modules/setting"
 )
 
-func UpdateCodeCommentReplies(x *xorm.Engine) error {
+func UpdateCodeCommentReplies(x db.EngineMigration) error {
 	type Comment struct {
 		ID          int64  `xorm:"pk autoincr"`
 		CommitSHA   string `xorm:"VARCHAR(40)"`

package/gitea/source/models/migrations/v1_14/v159.go

@@ -4,13 +4,12 @@
 package v1_14
 
 import (
-	"code.gitea.io/gitea/models/migrations/base"
-	"code.gitea.io/gitea/modules/timeutil"
-
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
+	"gitea.dev/models/migrations/base"
+	"gitea.dev/modules/timeutil"
 )
 
-func UpdateReactionConstraint(x *xorm.Engine) error {
+func UpdateReactionConstraint(x db.EngineMigration) error {
 	// Reaction represents a reactions on issues and comments.
 	type Reaction struct {
 		ID               int64              `xorm:"pk autoincr"`

package/gitea/source/models/migrations/v1_14/v160.go

@@ -3,11 +3,9 @@
 
 package v1_14
 
-import (
-	"xorm.io/xorm"
-)
+import "gitea.dev/models/db"
 
-func AddBlockOnOfficialReviewRequests(x *xorm.Engine) error {
+func AddBlockOnOfficialReviewRequests(x db.EngineMigration) error {
 	type ProtectedBranch struct {
 		BlockOnOfficialReviewRequests bool `xorm:"NOT NULL DEFAULT false"`
 	}

package/gitea/source/models/migrations/v1_14/v161.go

@@ -6,12 +6,11 @@ package v1_14
 import (
 	"context"
 
-	"code.gitea.io/gitea/models/migrations/base"
-
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
+	"gitea.dev/models/migrations/base"
 )
 
-func ConvertTaskTypeToString(x *xorm.Engine) error {
+func ConvertTaskTypeToString(x db.EngineMigration) error {
 	const (
 		GOGS int = iota + 1
 		SLACK

package/gitea/source/models/migrations/v1_14/v162.go

@@ -4,12 +4,11 @@
 package v1_14
 
 import (
-	"code.gitea.io/gitea/models/migrations/base"
-
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
+	"gitea.dev/models/migrations/base"
 )
 
-func ConvertWebhookTaskTypeToString(x *xorm.Engine) error {
+func ConvertWebhookTaskTypeToString(x db.EngineMigration) error {
 	const (
 		GOGS int = iota + 1
 		SLACK

package/gitea/source/models/migrations/v1_14/v163.go

@@ -4,12 +4,11 @@
 package v1_14
 
 import (
-	"code.gitea.io/gitea/models/migrations/base"
-
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
+	"gitea.dev/models/migrations/base"
 )
 
-func ConvertTopicNameFrom25To50(x *xorm.Engine) error {
+func ConvertTopicNameFrom25To50(x db.EngineMigration) error {
 	type Topic struct {
 		ID          int64  `xorm:"pk autoincr"`
 		Name        string `xorm:"UNIQUE VARCHAR(50)"`

package/gitea/source/models/migrations/v1_14/v164.go

@@ -6,7 +6,7 @@ package v1_14
 import (
 	"fmt"
 
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
 )
 
 // OAuth2Grant here is a snapshot of models.OAuth2Grant for this version
@@ -29,7 +29,7 @@ func (grant *OAuth2Grant) TableName() string {
 	return "oauth2_grant"
 }
 
-func AddScopeAndNonceColumnsToOAuth2Grant(x *xorm.Engine) error {
+func AddScopeAndNonceColumnsToOAuth2Grant(x db.EngineMigration) error {
 	if err := x.Sync(new(OAuth2Grant)); err != nil {
 		return fmt.Errorf("Sync: %w", err)
 	}

package/gitea/source/models/migrations/v1_14/v165.go

@@ -4,13 +4,13 @@
 package v1_14
 
 import (
-	"code.gitea.io/gitea/models/migrations/base"
+	"gitea.dev/models/db"
+	"gitea.dev/models/migrations/base"
 
-	"xorm.io/xorm"
 	"xorm.io/xorm/schemas"
 )
 
-func ConvertHookTaskTypeToVarcharAndTrim(x *xorm.Engine) error {
+func ConvertHookTaskTypeToVarcharAndTrim(x db.EngineMigration) error {
 	dbType := x.Dialect().URI().DBType
 	if dbType == schemas.SQLITE { // For SQLITE, varchar or char will always be represented as TEXT
 		return nil

package/gitea/source/models/migrations/v1_14/v166.go

@@ -7,15 +7,16 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 
+	"gitea.dev/models/db"
+
 	"golang.org/x/crypto/argon2"
 	"golang.org/x/crypto/bcrypt"
 	"golang.org/x/crypto/pbkdf2"
 	"golang.org/x/crypto/scrypt"
 	"xorm.io/builder"
-	"xorm.io/xorm"
 )
 
-func RecalculateUserEmptyPWD(x *xorm.Engine) (err error) {
+func RecalculateUserEmptyPWD(x db.EngineMigration) (err error) {
 	const (
 		algoBcrypt = "bcrypt"
 		algoScrypt = "scrypt"

package/gitea/source/models/migrations/v1_14/v167.go

@@ -6,10 +6,10 @@ package v1_14
 import (
 	"fmt"
 
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
 )
 
-func AddUserRedirect(x *xorm.Engine) (err error) {
+func AddUserRedirect(x db.EngineMigration) (err error) {
 	type UserRedirect struct {
 		ID             int64  `xorm:"pk autoincr"`
 		LowerName      string `xorm:"UNIQUE(s) INDEX NOT NULL"`

package/gitea/source/models/migrations/v1_14/v168.go

@@ -3,8 +3,8 @@
 
 package v1_14
 
-import "xorm.io/xorm"
+import "gitea.dev/models/db"
 
-func RecreateUserTableToFixDefaultValues(_ *xorm.Engine) error {
+func RecreateUserTableToFixDefaultValues(_ db.EngineMigration) error {
 	return nil
 }

package/gitea/source/models/migrations/v1_14/v169.go

@@ -3,11 +3,9 @@
 
 package v1_14
 
-import (
-	"xorm.io/xorm"
-)
+import "gitea.dev/models/db"
 
-func CommentTypeDeleteBranchUseOldRef(x *xorm.Engine) error {
+func CommentTypeDeleteBranchUseOldRef(x db.EngineMigration) error {
 	_, err := x.Exec("UPDATE comment SET old_ref = commit_sha, commit_sha = '' WHERE type = 11")
 	return err
 }

package/gitea/source/models/migrations/v1_14/v170.go

@@ -6,10 +6,10 @@ package v1_14
 import (
 	"fmt"
 
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
 )
 
-func AddDismissedReviewColumn(x *xorm.Engine) error {
+func AddDismissedReviewColumn(x db.EngineMigration) error {
 	type Review struct {
 		Dismissed bool `xorm:"NOT NULL DEFAULT false"`
 	}

package/gitea/source/models/migrations/v1_14/v171.go

@@ -6,10 +6,10 @@ package v1_14
 import (
 	"fmt"
 
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
 )
 
-func AddSortingColToProjectBoard(x *xorm.Engine) error {
+func AddSortingColToProjectBoard(x db.EngineMigration) error {
 	type ProjectBoard struct {
 		Sorting int8 `xorm:"NOT NULL DEFAULT 0"`
 	}

package/gitea/source/models/migrations/v1_14/v172.go

@@ -4,12 +4,11 @@
 package v1_14
 
 import (
-	"code.gitea.io/gitea/modules/timeutil"
-
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
+	"gitea.dev/modules/timeutil"
 )
 
-func AddSessionTable(x *xorm.Engine) error {
+func AddSessionTable(x db.EngineMigration) error {
 	type Session struct {
 		Key    string `xorm:"pk CHAR(16)"`
 		Data   []byte `xorm:"BLOB"`

package/gitea/source/models/migrations/v1_14/v173.go

@@ -6,10 +6,10 @@ package v1_14
 import (
 	"fmt"
 
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
 )
 
-func AddTimeIDCommentColumn(x *xorm.Engine) error {
+func AddTimeIDCommentColumn(x db.EngineMigration) error {
 	type Comment struct {
 		TimeID int64
 	}

package/gitea/source/models/migrations/v1_14/v174.go

@@ -6,10 +6,10 @@ package v1_14
 import (
 	"fmt"
 
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
 )
 
-func AddRepoTransfer(x *xorm.Engine) error {
+func AddRepoTransfer(x db.EngineMigration) error {
 	type RepoTransfer struct {
 		ID          int64 `xorm:"pk autoincr"`
 		DoerID      int64

package/gitea/source/models/migrations/v1_14/v175.go

@@ -7,13 +7,12 @@ import (
 	"fmt"
 	"regexp"
 
-	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/setting"
-
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
+	"gitea.dev/modules/log"
+	"gitea.dev/modules/setting"
 )
 
-func FixPostgresIDSequences(x *xorm.Engine) error {
+func FixPostgresIDSequences(x db.EngineMigration) error {
 	if !setting.Database.Type.IsPostgreSQL() {
 		return nil
 	}

package/gitea/source/models/migrations/v1_14/v176.go

@@ -3,14 +3,12 @@
 
 package v1_14
 
-import (
-	"xorm.io/xorm"
-)
+import "gitea.dev/models/db"
 
 // 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 *xorm.Engine) error {
+func RemoveInvalidLabels(x db.EngineMigration) error {
 	type Comment struct {
 		ID      int64 `xorm:"pk autoincr"`
 		Type    int   `xorm:"INDEX"`

package/gitea/source/models/migrations/v1_14/v176_test.go

@@ -6,7 +6,7 @@ package v1_14
 import (
 	"testing"
 
-	"code.gitea.io/gitea/models/migrations/base"
+	"gitea.dev/models/migrations/migrationtest"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -47,7 +47,7 @@ func Test_RemoveInvalidLabels(t *testing.T) {
 	}
 
 	// load and prepare the test database
-	x, deferable := base.PrepareTestEnv(t, 0, new(Comment), new(Issue), new(Repository), new(IssueLabel), new(Label))
+	x, deferable := migrationtest.PrepareTestEnv(t, 0, new(Comment), new(Issue), new(Repository), new(IssueLabel), new(Label))
 	if x == nil || t.Failed() {
 		defer deferable()
 		return

package/gitea/source/models/migrations/v1_14/v177.go

@@ -6,11 +6,11 @@ package v1_14
 import (
 	"fmt"
 
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
 )
 
 // DeleteOrphanedIssueLabels looks through the database for issue_labels where the label no longer exists and deletes them.
-func DeleteOrphanedIssueLabels(x *xorm.Engine) error {
+func DeleteOrphanedIssueLabels(x db.EngineMigration) error {
 	type IssueLabel struct {
 		ID      int64 `xorm:"pk autoincr"`
 		IssueID int64 `xorm:"UNIQUE(s)"`

package/gitea/source/models/migrations/v1_14/v177_test.go

@@ -6,8 +6,8 @@ package v1_14
 import (
 	"testing"
 
-	"code.gitea.io/gitea/models/migrations/base"
-	"code.gitea.io/gitea/modules/timeutil"
+	"gitea.dev/models/migrations/migrationtest"
+	"gitea.dev/modules/timeutil"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -34,7 +34,7 @@ func Test_DeleteOrphanedIssueLabels(t *testing.T) {
 	}
 
 	// Prepare and load the testing database
-	x, deferable := base.PrepareTestEnv(t, 0, new(IssueLabel), new(Label))
+	x, deferable := migrationtest.PrepareTestEnv(t, 0, new(IssueLabel), new(Label))
 	if x == nil || t.Failed() {
 		defer deferable()
 		return