1
1
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00

Upgrade xorm to v0.8.0 (#8536)

This commit is contained in:
Lunny Xiao
2019-10-17 17:26:49 +08:00
committed by Antoine GIRARD
parent ae132632a9
commit d151503d34
197 changed files with 191 additions and 291 deletions

View File

@@ -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

View File

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

View File

@@ -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 {

View File

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

View File

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

View File

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

View File

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

View File

@@ -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

View File

@@ -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) {

View File

@@ -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 {

View File

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

View File

@@ -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) {

View File

@@ -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.

View File

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

View File

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

View File

@@ -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) {

View File

@@ -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) {

View File

@@ -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) {

View File

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

View File

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

View File

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

View File

@@ -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 {

View File

@@ -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 {

View File

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

View File

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

View File

@@ -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) {

View File

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

View File

@@ -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) {

View File

@@ -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

View File

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

View File

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

View File

@@ -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) {

View File

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

View File

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

View File

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

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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) {

View File

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

View File

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

View File

@@ -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 {

View File

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

View File

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

View File

@@ -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 {

View File

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

View File

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

View File

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

View File

@@ -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 {

View File

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

View File

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

View File

@@ -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 {

View File

@@ -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 {

View File

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

View File

@@ -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 {

View File

@@ -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-]*$`)

View File

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

View File

@@ -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) {

View File

@@ -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 {

View File

@@ -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 {

View File

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

View File

@@ -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 {

View File

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

View File

@@ -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 {

View File

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

View File

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

View File

@@ -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 {

View File

@@ -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

View File

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

View File

@@ -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 {

View File

@@ -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 {

View File

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

View File

@@ -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 {

View File

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

View File

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

View File

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

View File

@@ -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

View File

@@ -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 {

View File

@@ -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 {

View File

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

View File

@@ -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

View File

@@ -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 {

View File

@@ -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

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

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