feat: update gitea vendor

2026-09-26 21:18:24 +00:00
parent c439c1b948
commit d9b2a4e787
3538 changed files with 116131 additions and 44340 deletions
@@ -6,9 +6,9 @@ package v1_16
 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)
 }
@@ -7,13 +7,12 @@ import (
 	"encoding/binary"
 	"fmt"

-	"code.gitea.io/gitea/models/migrations/base"
-	"code.gitea.io/gitea/modules/json"
-
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
+	"gitea.dev/models/migrations/base"
+	"gitea.dev/modules/json"
 )

-func UnwrapLDAPSourceCfg(x *xorm.Engine) error {
+func UnwrapLDAPSourceCfg(x db.EngineMigration) error {
 	jsonUnmarshalHandleDoubleEncode := func(bs []byte, v any) error {
 		err := json.Unmarshal(bs, v)
 		if err != nil {
@@ -6,8 +6,8 @@ package v1_16
 import (
 	"testing"

-	"code.gitea.io/gitea/models/migrations/base"
-	"code.gitea.io/gitea/modules/json"
+	"gitea.dev/models/migrations/migrationtest"
+	"gitea.dev/modules/json"

 	"github.com/stretchr/testify/assert"
 )
@@ -27,7 +27,7 @@ func (ls *LoginSourceOriginalV189) TableName() string {

 func Test_UnwrapLDAPSourceCfg(t *testing.T) {
 	// Prepare and load the testing database
-	x, deferable := base.PrepareTestEnv(t, 0, new(LoginSourceOriginalV189))
+	x, deferable := migrationtest.PrepareTestEnv(t, 0, new(LoginSourceOriginalV189))
 	if x == nil || t.Failed() {
 		defer deferable()
 		return
@@ -6,10 +6,10 @@ package v1_16
 import (
 	"fmt"

-	"xorm.io/xorm"
+	"gitea.dev/models/db"
 )

-func AddAgitFlowPullRequest(x *xorm.Engine) error {
+func AddAgitFlowPullRequest(x db.EngineMigration) error {
 	type PullRequestFlow int

 	type PullRequest struct {
@@ -4,12 +4,11 @@
 package v1_16

 import (
-	"code.gitea.io/gitea/modules/setting"
-
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
+	"gitea.dev/modules/setting"
 )

-func AlterIssueAndCommentTextFieldsToLongText(x *xorm.Engine) error {
+func AlterIssueAndCommentTextFieldsToLongText(x db.EngineMigration) error {
 	sess := x.NewSession()
 	defer sess.Close()
 	if err := sess.Begin(); err != nil {
@@ -4,12 +4,11 @@
 package v1_16

 import (
-	"code.gitea.io/gitea/models/migrations/base"
-
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
+	"gitea.dev/models/migrations/base"
 )

-func RecreateIssueResourceIndexTable(x *xorm.Engine) error {
+func RecreateIssueResourceIndexTable(x db.EngineMigration) error {
 	type IssueIndex struct {
 		GroupID  int64 `xorm:"pk"`
 		MaxIndex int64 `xorm:"index"`
@@ -3,11 +3,9 @@

 package v1_16

-import (
-	"xorm.io/xorm"
-)
+import "gitea.dev/models/db"

-func AddRepoIDForAttachment(x *xorm.Engine) error {
+func AddRepoIDForAttachment(x db.EngineMigration) error {
 	type Attachment struct {
 		ID         int64  `xorm:"pk autoincr"`
 		UUID       string `xorm:"uuid UNIQUE"`
@@ -6,7 +6,7 @@ package v1_16
 import (
 	"testing"

-	"code.gitea.io/gitea/models/migrations/base"
+	"gitea.dev/models/migrations/migrationtest"

 	"github.com/stretchr/testify/assert"
 )
@@ -31,7 +31,7 @@ func Test_AddRepoIDForAttachment(t *testing.T) {
 	}

 	// Prepare and load the testing database
-	x, deferrable := base.PrepareTestEnv(t, 0, new(Attachment), new(Issue), new(Release))
+	x, deferrable := migrationtest.PrepareTestEnv(t, 0, new(Attachment), new(Issue), new(Release))
 	defer deferrable()
 	if x == nil || t.Failed() {
 		return
@@ -6,10 +6,10 @@ package v1_16
 import (
 	"fmt"

-	"xorm.io/xorm"
+	"gitea.dev/models/db"
 )

-func AddBranchProtectionUnprotectedFilesColumn(x *xorm.Engine) error {
+func AddBranchProtectionUnprotectedFilesColumn(x db.EngineMigration) error {
 	type ProtectedBranch struct {
 		UnprotectedFilePatterns string `xorm:"TEXT"`
 	}
@@ -6,10 +6,10 @@ package v1_16
 import (
 	"fmt"

-	"xorm.io/xorm"
+	"gitea.dev/models/db"
 )

-func AddTableCommitStatusIndex(x *xorm.Engine) error {
+func AddTableCommitStatusIndex(x db.EngineMigration) error {
 	// CommitStatusIndex represents a table for commit status index
 	type CommitStatusIndex struct {
 		ID       int64
@@ -6,7 +6,7 @@ package v1_16
 import (
 	"testing"

-	"code.gitea.io/gitea/models/migrations/base"
+	"gitea.dev/models/migrations/migrationtest"

 	"github.com/stretchr/testify/assert"
 )
@@ -21,7 +21,7 @@ func Test_AddTableCommitStatusIndex(t *testing.T) {
 	}

 	// Prepare and load the testing database
-	x, deferable := base.PrepareTestEnv(t, 0, new(CommitStatus))
+	x, deferable := migrationtest.PrepareTestEnv(t, 0, new(CommitStatus))
 	if x == nil || t.Failed() {
 		defer deferable()
 		return
@@ -6,10 +6,10 @@ package v1_16
 import (
 	"fmt"

-	"xorm.io/xorm"
+	"gitea.dev/models/db"
 )

-func AddColorColToProjectBoard(x *xorm.Engine) error {
+func AddColorColToProjectBoard(x db.EngineMigration) error {
 	type ProjectBoard struct {
 		Color string `xorm:"VARCHAR(7)"`
 	}
@@ -3,11 +3,9 @@

 package v1_16

-import (
-	"xorm.io/xorm"
-)
+import "gitea.dev/models/db"

-func AddRenamedBranchTable(x *xorm.Engine) error {
+func AddRenamedBranchTable(x db.EngineMigration) error {
 	type RenamedBranch struct {
 		ID          int64 `xorm:"pk autoincr"`
 		RepoID      int64 `xorm:"INDEX NOT NULL"`
@@ -6,12 +6,11 @@ package v1_16
 import (
 	"fmt"

-	"code.gitea.io/gitea/modules/timeutil"
-
-	"xorm.io/xorm"
+	"gitea.dev/models/db"
+	"gitea.dev/modules/timeutil"
 )

-func AddTableIssueContentHistory(x *xorm.Engine) error {
+func AddTableIssueContentHistory(x db.EngineMigration) error {
 	type IssueContentHistory struct {
 		ID             int64 `xorm:"pk autoincr"`
 		PosterID       int64
@@ -6,10 +6,10 @@ package v1_16
 import (
 	"fmt"

-	"xorm.io/xorm"
+	"gitea.dev/models/db"
 )

-func AddTableAppState(x *xorm.Engine) error {
+func AddTableAppState(x db.EngineMigration) error {
 	type AppState struct {
 		ID       string `xorm:"pk varchar(200)"`
 		Revision int64
@@ -3,11 +3,9 @@

 package v1_16

-import (
-	"xorm.io/xorm"
-)
+import "gitea.dev/models/db"

-func DropTableRemoteVersion(x *xorm.Engine) error {
+func DropTableRemoteVersion(x db.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
@@ -6,10 +6,10 @@ package v1_16
 import (
 	"fmt"

-	"xorm.io/xorm"
+	"gitea.dev/models/db"
 )

-func CreateUserSettingsTable(x *xorm.Engine) error {
+func CreateUserSettingsTable(x db.EngineMigration) error {
 	type UserSetting struct {
 		ID           int64  `xorm:"pk autoincr"`
 		UserID       int64  `xorm:"index unique(key_userid)"`              // to load all of someone's settings
@@ -3,11 +3,9 @@

 package v1_16

-import (
-	"xorm.io/xorm"
-)
+import "gitea.dev/models/db"

-func AddProjectIssueSorting(x *xorm.Engine) error {
+func AddProjectIssueSorting(x db.EngineMigration) error {
 	// ProjectIssue saves relation from issue to a project
 	type ProjectIssue struct {
 		Sorting int64 `xorm:"NOT NULL DEFAULT 0"`
@@ -3,9 +3,9 @@

 package v1_16

-import "xorm.io/xorm"
+import "gitea.dev/models/db"

-func AddSSHKeyIsVerified(x *xorm.Engine) error {
+func AddSSHKeyIsVerified(x db.EngineMigration) error {
 	type PublicKey struct {
 		Verified bool `xorm:"NOT NULL DEFAULT false"`
 	}
@@ -4,13 +4,13 @@
 package v1_16

 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 MigrateUserPasswordSalt(x *xorm.Engine) error {
+func MigrateUserPasswordSalt(x db.EngineMigration) error {
 	dbType := x.Dialect().URI().DBType
 	// For SQLITE, the max length doesn't matter.
 	if dbType == schemas.SQLITE {
@@ -6,10 +6,10 @@ package v1_16
 import (
 	"fmt"

-	"xorm.io/xorm"
+	"gitea.dev/models/db"
 )

-func AddAuthorizeColForTeamUnit(x *xorm.Engine) error {
+func AddAuthorizeColForTeamUnit(x db.EngineMigration) error {
 	type TeamUnit struct {
 		ID         int64 `xorm:"pk autoincr"`
 		OrgID      int64 `xorm:"INDEX"`
@@ -3,11 +3,9 @@

 package v1_16

-import (
-	"xorm.io/xorm"
-)
+import "gitea.dev/models/db"

-func AddWebAuthnCred(x *xorm.Engine) error {
+func AddWebAuthnCred(x db.EngineMigration) error {
 	// NO-OP Don't migrate here - let v210 do this.

 	return nil
@@ -3,11 +3,9 @@

 package v1_16

-import (
-	"xorm.io/xorm"
-)
+import "gitea.dev/models/db"

-func UseBase32HexForCredIDInWebAuthnCredential(x *xorm.Engine) error {
+func UseBase32HexForCredIDInWebAuthnCredential(x db.EngineMigration) error {
 	// noop
 	return nil
 }
@@ -3,11 +3,9 @@

 package v1_16

-import (
-	"xorm.io/xorm"
-)
+import "gitea.dev/models/db"

-func IncreaseCredentialIDTo410(x *xorm.Engine) error {
+func IncreaseCredentialIDTo410(x db.EngineMigration) error {
 	// no-op
 	// v208 was completely wrong
 	// So now we have to no-op again.
@@ -8,16 +8,16 @@ import (
 	"fmt"
 	"strings"

-	"code.gitea.io/gitea/models/migrations/base"
-	"code.gitea.io/gitea/modules/timeutil"
+	"gitea.dev/models/db"
+	"gitea.dev/models/migrations/base"
+	"gitea.dev/modules/timeutil"

 	"github.com/tstranex/u2f"
-	"xorm.io/xorm"
 	"xorm.io/xorm/schemas"
 )

 // v208 migration was completely broken
-func RemigrateU2FCredentials(x *xorm.Engine) error {
+func RemigrateU2FCredentials(x db.EngineMigration) error {
 	// Create webauthnCredential table
 	type webauthnCredential struct {
 		ID              int64 `xorm:"pk autoincr"`
@@ -6,8 +6,8 @@ package v1_16
 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"
 	"xorm.io/xorm/schemas"
@@ -44,7 +44,7 @@ func Test_RemigrateU2FCredentials(t *testing.T) {
 	}

 	// Prepare and load the testing database
-	x, deferable := base.PrepareTestEnv(t, 0, new(WebauthnCredential), new(U2fRegistration), new(ExpectedWebauthnCredential))
+	x, deferable := migrationtest.PrepareTestEnv(t, 0, new(WebauthnCredential), new(U2fRegistration), new(ExpectedWebauthnCredential))
 	if x == nil || t.Failed() {
 		defer deferable()
 		return