Upgrade xorm to v0.8.0 (#8536)

models/attachment.go

@@ -14,8 +14,8 @@ import (
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	gouuid "github.com/satori/go.uuid"
+	"xorm.io/xorm"
 )
 
 // Attachment represent a attachment of issue/comment/release.

models/commit_status.go

@@ -16,7 +16,7 @@ import (
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // CommitStatusState holds the state of a Status

models/gpg_key.go

@@ -20,10 +20,10 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	"github.com/keybase/go-crypto/openpgp"
 	"github.com/keybase/go-crypto/openpgp/armor"
 	"github.com/keybase/go-crypto/openpgp/packet"
+	"xorm.io/xorm"
 )
 
 // GPGKey represents a GPG key.

models/issue.go

@@ -19,9 +19,9 @@ import (
 	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/modules/util"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 // Issue represents an issue or pull request of repository.

models/issue_assignees.go

@@ -10,7 +10,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	api "code.gitea.io/gitea/modules/structs"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // IssueAssignees saves all issue assignees

models/issue_comment.go

@@ -18,9 +18,9 @@ import (
 	api "code.gitea.io/gitea/modules/structs"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 // CommentType defines whether a comment is just a simple comment, an action (like close) or a reference.

models/issue_label.go

@@ -13,8 +13,8 @@ import (
 
 	api "code.gitea.io/gitea/modules/structs"
 
-	"github.com/go-xorm/xorm"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")

models/issue_milestone.go

@@ -12,7 +12,7 @@ import (
 	"code.gitea.io/gitea/modules/timeutil"
 	"xorm.io/builder"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // Milestone represents a milestone of repository.

models/issue_reaction.go

@@ -11,8 +11,8 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 // Reaction represents a reactions on issues and comments.

models/issue_tracked_time.go

@@ -10,8 +10,8 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
 
-	"github.com/go-xorm/xorm"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 // TrackedTime represents a time that was spent for a specific issue.

models/issue_user.go

@@ -7,7 +7,7 @@ package models
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // IssueUser represents an issue-user relation.

models/issue_xref.go

@@ -8,8 +8,8 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/references"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
+	"xorm.io/xorm"
 )
 
 type crossReference struct {

models/lfs_lock.go

@@ -14,7 +14,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	api "code.gitea.io/gitea/modules/structs"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // LFSLock represents a git lfs lock of repository.

models/login_source.go

@@ -21,9 +21,9 @@ import (
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
 	"xorm.io/core"
+	"xorm.io/xorm"
 )
 
 // LoginType represents an login type.

models/migrate.go

@@ -4,7 +4,7 @@
 
 package models
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 // InsertMilestones creates milestones of repository.
 func InsertMilestones(ms ...*Milestone) (err error) {

models/migrations/migrations.go

@@ -21,10 +21,10 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
 	gouuid "github.com/satori/go.uuid"
 	"github.com/unknwon/com"
 	ini "gopkg.in/ini.v1"
+	"xorm.io/xorm"
 )
 
 const minDBVersion = 4

models/migrations/v100.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func updateMigrationServiceTypes(x *xorm.Engine) error {

models/migrations/v13.go

@@ -9,8 +9,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
+	"xorm.io/xorm"
 )
 
 func ldapUseSSLToSecurityProtocol(x *xorm.Engine) error {

models/migrations/v14.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func setCommentUpdatedWithCreated(x *xorm.Engine) (err error) {

models/migrations/v15.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func createAllowCreateOrganizationColumn(x *xorm.Engine) error {

models/migrations/v16.go

@@ -10,7 +10,7 @@ import (
 
 	"code.gitea.io/gitea/modules/markup"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // Enumerate all the unit types

models/migrations/v17.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func setProtectedBranchUpdatedWithCreated(x *xorm.Engine) (err error) {

models/migrations/v18.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // ExternalLoginUser makes the connecting between some existing user and additional external login sources

models/migrations/v19.go

@@ -13,8 +13,8 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
+	"xorm.io/xorm"
 )
 
 func generateAndMigrateGitHooks(x *xorm.Engine) (err error) {

models/migrations/v20.go

@@ -16,7 +16,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func useNewNameAvatars(x *xorm.Engine) error {

models/migrations/v21.go

@@ -11,8 +11,8 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
+	"xorm.io/xorm"
 )
 
 const (

models/migrations/v22.go

@@ -13,8 +13,8 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
+	"xorm.io/xorm"
 )
 
 func generateAndMigrateWikiGitHooks(x *xorm.Engine) (err error) {

models/migrations/v23.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // UserOpenID is the list of all OpenID identities of a user.

models/migrations/v24.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"time"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func changeGPGKeysColumns(x *xorm.Engine) error {

models/migrations/v25.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addUserOpenIDShow(x *xorm.Engine) error {

models/migrations/v26.go

@@ -16,8 +16,8 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
 	"github.com/unknwon/com"
+	"xorm.io/xorm"
 )
 
 func generateAndMigrateGitHookChains(x *xorm.Engine) (err error) {

models/migrations/v27.go

@@ -11,7 +11,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func convertIntervalToDuration(x *xorm.Engine) (err error) {

models/migrations/v28.go

@@ -14,7 +14,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addRepoSize(x *xorm.Engine) (err error) {

models/migrations/v29.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // CommitStatus see models/status.go

models/migrations/v30.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addExternalLoginUserPK(x *xorm.Engine) error {

models/migrations/v31.go

@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/go-xorm/xorm"
 	"xorm.io/core"
+	"xorm.io/xorm"
 )
 
 func addLoginSourceSyncEnabledColumn(x *xorm.Engine) error {

models/migrations/v32.go

@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addUnitsToRepoTeam(x *xorm.Engine) error {
 	type Team struct {

models/migrations/v33.go

@@ -10,7 +10,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func removeActionColumns(x *xorm.Engine) error {

models/migrations/v34.go

@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // Team see models/team.go

models/migrations/v35.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addCommentIDToAction(x *xorm.Engine) error {

models/migrations/v36.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"code.gitea.io/gitea/models"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func regenerateGitHooks36(x *xorm.Engine) (err error) {

models/migrations/v37.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"html"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func unescapeUserFullNames(x *xorm.Engine) (err error) {

models/migrations/v38.go

@@ -9,8 +9,8 @@ import (
 
 	"code.gitea.io/gitea/models"
 
-	"github.com/go-xorm/xorm"
 	"xorm.io/core"
+	"xorm.io/xorm"
 )
 
 func removeCommitsUnitType(x *xorm.Engine) (err error) {

models/migrations/v39.go

@@ -11,7 +11,7 @@ import (
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 // ReleaseV39 describes the added field for Release

models/migrations/v40.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func fixProtectedBranchCanPushValue(x *xorm.Engine) error {

models/migrations/v41.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func removeDuplicateUnitTypes(x *xorm.Engine) error {

models/migrations/v45.go

@@ -8,7 +8,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func removeIndexColumnFromRepoUnitTable(x *xorm.Engine) (err error) {

models/migrations/v46.go

@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func removeOrganizationWatchRepo(x *xorm.Engine) error {

models/migrations/v47.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addDeletedBranch(x *xorm.Engine) (err error) {

models/migrations/v48.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addRepoIndexerStatus(x *xorm.Engine) error {

models/migrations/v49.go

@@ -10,7 +10,7 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addTimetracking(x *xorm.Engine) error {

models/migrations/v50.go

@@ -10,7 +10,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func migrateProtectedBranchStruct(x *xorm.Engine) error {

models/migrations/v51.go

@@ -8,7 +8,7 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/log"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addDefaultValueToUserProhibitLogin(x *xorm.Engine) (err error) {

models/migrations/v52.go

@@ -10,7 +10,7 @@ import (
 
 	"code.gitea.io/gitea/models"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addLFSLock(x *xorm.Engine) error {

models/migrations/v53.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addReactions(x *xorm.Engine) error {

models/migrations/v54.go

@@ -9,7 +9,7 @@ import (
 
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addPullRequestOptions(x *xorm.Engine) error {

models/migrations/v55.go

@@ -9,7 +9,7 @@ import (
 
 	"code.gitea.io/gitea/models"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addModeToDeploKeys(x *xorm.Engine) error {

models/migrations/v56.go

@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func removeIsOwnerColumnFromOrgUser(x *xorm.Engine) (err error) {

models/migrations/v57.go

@@ -9,7 +9,7 @@ import (
 
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addIssueClosedTime(x *xorm.Engine) error {

models/migrations/v58.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addLabelsDescriptions(x *xorm.Engine) error {

models/migrations/v59.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addProtectedBranchMergeWhitelist(x *xorm.Engine) error {

models/migrations/v60.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addFsckEnabledToRepo(x *xorm.Engine) error {

models/migrations/v61.go

@@ -12,7 +12,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addSizeToAttachment(x *xorm.Engine) error {

models/migrations/v62.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addLastUsedPasscodeTOTP(x *xorm.Engine) error {

models/migrations/v63.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addLanguageSetting(x *xorm.Engine) error {

models/migrations/v64.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addMultipleAssignees(x *xorm.Engine) error {

models/migrations/v65.go

@@ -3,7 +3,7 @@ package migrations
 import (
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addU2FReg(x *xorm.Engine) error {

models/migrations/v66.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addLoginSourceIDToPublicKeyTable(x *xorm.Engine) error {

models/migrations/v67.go

@@ -9,7 +9,7 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func removeStaleWatches(x *xorm.Engine) error {

models/migrations/v68.go

@@ -11,7 +11,7 @@ import (
 
 	"code.gitea.io/gitea/modules/log"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 var topicPattern = regexp.MustCompile(`^[a-z0-9][a-z0-9-]*$`)

models/migrations/v69.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func moveTeamUnitsToTeamUnitTable(x *xorm.Engine) error {

models/migrations/v70.go

@@ -10,7 +10,7 @@ import (
 
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addIssueDependencies(x *xorm.Engine) (err error) {

models/migrations/v71.go

@@ -11,8 +11,8 @@ import (
 	"code.gitea.io/gitea/modules/generate"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
 	"golang.org/x/crypto/pbkdf2"
+	"xorm.io/xorm"
 )
 
 func addScratchHash(x *xorm.Engine) error {

models/migrations/v72.go

@@ -9,7 +9,7 @@ import (
 
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addReview(x *xorm.Engine) error {

models/migrations/v73.go

@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addMustChangePassword(x *xorm.Engine) error {

models/migrations/v74.go

@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addApprovalWhitelistsToProtectedBranches(x *xorm.Engine) error {
 	type ProtectedBranch struct {

models/migrations/v75.go

@@ -5,8 +5,8 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 func clearNonusedData(x *xorm.Engine) error {

models/migrations/v76.go

@@ -9,7 +9,7 @@ import (
 
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addPullRequestRebaseWithMerge(x *xorm.Engine) error {

models/migrations/v77.go

@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addUserDefaultTheme(x *xorm.Engine) error {

models/migrations/v78.go

@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func renameRepoIsBareToIsEmpty(x *xorm.Engine) error {

models/migrations/v79.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addCanCloseIssuesViaCommitInAnyBranch(x *xorm.Engine) error {

models/migrations/v80.go

@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addIsLockedToIssues(x *xorm.Engine) error {
 	// Issue see models/issue.go

models/migrations/v81.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func changeU2FCounterType(x *xorm.Engine) error {

models/migrations/v82.go

@@ -10,7 +10,7 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/git"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func fixReleaseSha1OnReleaseTable(x *xorm.Engine) error {

models/migrations/v83.go

@@ -7,7 +7,7 @@ package migrations
 import (
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addUploaderIDForAttachment(x *xorm.Engine) error {

models/migrations/v84.go

@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addGPGKeyImport(x *xorm.Engine) error {

models/migrations/v85.go

@@ -11,7 +11,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/timeutil"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func hashAppToken(x *xorm.Engine) error {

models/migrations/v86.go

@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addHTTPMethodToWebhook(x *xorm.Engine) error {

models/migrations/v87.go

@@ -5,7 +5,7 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func addAvatarFieldToRepository(x *xorm.Engine) error {

models/migrations/v88.go

@@ -8,7 +8,7 @@ import (
 	"crypto/sha1"
 	"fmt"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func hashContext(context string) string {

models/migrations/v89.go

@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addOriginalMigrationInfo(x *xorm.Engine) error {
 	// Issue see models/issue.go

models/migrations/v90.go

@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func changeSomeColumnsLengthOfRepo(x *xorm.Engine) error {
 	type Repository struct {

models/migrations/v91.go

@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addIndexOnRepositoryAndComment(x *xorm.Engine) error {
 	type Repository struct {

models/migrations/v92.go

@@ -5,8 +5,8 @@
 package migrations
 
 import (
-	"github.com/go-xorm/xorm"
 	"xorm.io/builder"
+	"xorm.io/xorm"
 )
 
 func removeLingeringIndexStatus(x *xorm.Engine) error {

models/migrations/v93.go

@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addEmailNotificationEnabledToUser(x *xorm.Engine) error {
 	// User see models/user.go

models/migrations/v94.go

@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addStatusCheckColumnsForProtectedBranches(x *xorm.Engine) error {
 	type ProtectedBranch struct {

models/migrations/v95.go

@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addCrossReferenceColumns(x *xorm.Engine) error {
 	// Comment see models/comment.go

models/migrations/v96.go

@@ -10,7 +10,7 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/go-xorm/xorm"
+	"xorm.io/xorm"
 )
 
 func deleteOrphanedAttachments(x *xorm.Engine) error {

models/migrations/v97.go

@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addRepoAdminChangeTeamAccessColumnForUser(x *xorm.Engine) error {
 	type User struct {

models/migrations/v98.go

@@ -4,7 +4,7 @@
 
 package migrations
 
-import "github.com/go-xorm/xorm"
+import "xorm.io/xorm"
 
 func addOriginalAuthorOnMigratedReleases(x *xorm.Engine) error {
 	type Release struct {