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

Rename Sync2 -> Sync (#26479)

The xorm `Sync2` has already been deprecated in favor of `Sync`,
so let's do the same inside the Gitea codebase.

Command used to replace everything:
```sh
for i in $(ag Sync2 --files-with-matches); do vim $i -c ':%sno/Sync2/Sync/g' -c ':wq'; done
```
This commit is contained in:
delvh
2023-08-13 21:17:21 +02:00
committed by GitHub
parent 50fc22eecf
commit e10ba5e5e0
122 changed files with 184 additions and 184 deletions

View File

@@ -20,7 +20,7 @@ func AddPackageTables(x *xorm.Engine) error {
SemverCompatible bool `xorm:"NOT NULL DEFAULT false"`
}
if err := x.Sync2(new(Package)); err != nil {
if err := x.Sync(new(Package)); err != nil {
return err
}
@@ -36,7 +36,7 @@ func AddPackageTables(x *xorm.Engine) error {
DownloadCount int64 `xorm:"NOT NULL DEFAULT 0"`
}
if err := x.Sync2(new(PackageVersion)); err != nil {
if err := x.Sync(new(PackageVersion)); err != nil {
return err
}
@@ -48,7 +48,7 @@ func AddPackageTables(x *xorm.Engine) error {
Value string `xorm:"TEXT NOT NULL"`
}
if err := x.Sync2(new(PackageProperty)); err != nil {
if err := x.Sync(new(PackageProperty)); err != nil {
return err
}
@@ -63,7 +63,7 @@ func AddPackageTables(x *xorm.Engine) error {
CreatedUnix timeutil.TimeStamp `xorm:"created INDEX NOT NULL"`
}
if err := x.Sync2(new(PackageFile)); err != nil {
if err := x.Sync(new(PackageFile)); err != nil {
return err
}
@@ -77,7 +77,7 @@ func AddPackageTables(x *xorm.Engine) error {
CreatedUnix timeutil.TimeStamp `xorm:"created INDEX NOT NULL"`
}
if err := x.Sync2(new(PackageBlob)); err != nil {
if err := x.Sync(new(PackageBlob)); err != nil {
return err
}
@@ -89,5 +89,5 @@ func AddPackageTables(x *xorm.Engine) error {
UpdatedUnix timeutil.TimeStamp `xorm:"updated INDEX NOT NULL"`
}
return x.Sync2(new(PackageBlobUpload))
return x.Sync(new(PackageBlobUpload))
}

View File

@@ -13,5 +13,5 @@ func AddAllowMaintainerEdit(x *xorm.Engine) error {
AllowMaintainerEdit bool `xorm:"NOT NULL DEFAULT false"`
}
return x.Sync2(new(PullRequest))
return x.Sync(new(PullRequest))
}

View File

@@ -18,5 +18,5 @@ func AddAutoMergeTable(x *xorm.Engine) error {
CreatedUnix int64 `xorm:"created"`
}
return x.Sync2(&PullAutoMerge{})
return x.Sync(&PullAutoMerge{})
}

View File

@@ -20,5 +20,5 @@ func AddReviewViewedFiles(x *xorm.Engine) error {
UpdatedUnix timeutil.TimeStamp `xorm:"updated"`
}
return x.Sync2(new(ReviewState))
return x.Sync(new(ReviewState))
}

View File

@@ -48,5 +48,5 @@ func (*improveActionTableIndicesAction) TableIndices() []*schemas.Index {
}
func ImproveActionTableIndices(x *xorm.Engine) error {
return x.Sync2(&improveActionTableIndicesAction{})
return x.Sync(&improveActionTableIndicesAction{})
}

View File

@@ -26,5 +26,5 @@ func AddSyncOnCommitColForPushMirror(x *xorm.Engine) error {
LastError string `xorm:"text"`
}
return x.Sync2(new(PushMirror))
return x.Sync(new(PushMirror))
}

View File

@@ -30,7 +30,7 @@ func StoreWebauthnCredentialIDAsBytes(x *xorm.Engine) error {
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
if err := x.Sync2(&webauthnCredential{}); err != nil {
if err := x.Sync(&webauthnCredential{}); err != nil {
return err
}

View File

@@ -49,7 +49,7 @@ func DropOldCredentialIDColumn(x *xorm.Engine) error {
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
if err := x.Sync2(&webauthnCredential{}); err != nil {
if err := x.Sync(&webauthnCredential{}); err != nil {
return err
}

View File

@@ -53,8 +53,8 @@ func RenameCredentialIDBytes(x *xorm.Engine) error {
return err
}
if err := sess.Sync2(new(webauthnCredential)); err != nil {
return fmt.Errorf("error on Sync2: %w", err)
if err := sess.Sync(new(webauthnCredential)); err != nil {
return fmt.Errorf("error on Sync: %w", err)
}
if credentialIDExist {
@@ -99,5 +99,5 @@ func RenameCredentialIDBytes(x *xorm.Engine) error {
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
return x.Sync2(&webauthnCredential{})
return x.Sync(&webauthnCredential{})
}