1
0
Fork 0
forked from forgejo/forgejo

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
122 changed files with 184 additions and 184 deletions

View file

@ -13,5 +13,5 @@ func AddLFSMirrorColumns(x *xorm.Engine) error {
LFSEndpoint string `xorm:"lfs_endpoint TEXT"`
}
return x.Sync2(new(Mirror))
return x.Sync(new(Mirror))
}

View file

@ -26,7 +26,7 @@ func AddPrimaryEmail2EmailAddress(x *xorm.Engine) error {
}
// Add lower_email and is_primary columns
if err := x.Table("email_address").Sync2(new(EmailAddress1)); err != nil {
if err := x.Table("email_address").Sync(new(EmailAddress1)); err != nil {
return err
}
@ -44,7 +44,7 @@ func AddPrimaryEmail2EmailAddress(x *xorm.Engine) error {
}
// change lower_email as unique
if err := x.Sync2(new(EmailAddress)); err != nil {
if err := x.Sync(new(EmailAddress)); err != nil {
return err
}

View file

@ -20,7 +20,7 @@ func AddIssueResourceIndexTable(x *xorm.Engine) error {
return err
}
if err := sess.Table("issue_index").Sync2(new(ResourceIndex)); err != nil {
if err := sess.Table("issue_index").Sync(new(ResourceIndex)); err != nil {
return err
}

View file

@ -30,8 +30,8 @@ func CreatePushMirrorTable(x *xorm.Engine) error {
return err
}
if err := sess.Sync2(new(PushMirror)); err != nil {
return fmt.Errorf("Sync2: %w", err)
if err := sess.Sync(new(PushMirror)); err != nil {
return fmt.Errorf("Sync: %w", err)
}
return sess.Commit()

View file

@ -42,8 +42,8 @@ func RenameTaskErrorsToMessage(x *xorm.Engine) error {
return err
}
if err := sess.Sync2(new(Task)); err != nil {
return fmt.Errorf("error on Sync2: %w", err)
if err := sess.Sync(new(Task)); err != nil {
return fmt.Errorf("error on Sync: %w", err)
}
if messageExist {

View file

@ -17,5 +17,5 @@ func AddRepoArchiver(x *xorm.Engine) error {
CommitID string `xorm:"VARCHAR(40) unique(s)"`
CreatedUnix int64 `xorm:"INDEX NOT NULL created"`
}
return x.Sync2(new(RepoArchiver))
return x.Sync(new(RepoArchiver))
}

View file

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

View file

@ -15,7 +15,7 @@ func DropWebhookColumns(x *xorm.Engine) error {
Signature string `xorm:"TEXT"`
IsSSL bool `xorm:"is_ssl"`
}
if err := x.Sync2(new(Webhook)); err != nil {
if err := x.Sync(new(Webhook)); err != nil {
return err
}
@ -27,7 +27,7 @@ func DropWebhookColumns(x *xorm.Engine) error {
ContentType int
IsSSL bool
}
if err := x.Sync2(new(HookTask)); err != nil {
if err := x.Sync(new(HookTask)); err != nil {
return err
}