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:
parent
50fc22eecf
commit
e10ba5e5e0
122 changed files with 184 additions and 184 deletions
|
@ -14,8 +14,8 @@ func AddChangedProtectedFilesPullRequestColumn(x *xorm.Engine) error {
|
|||
ChangedProtectedFiles []string `xorm:"TEXT JSON"`
|
||||
}
|
||||
|
||||
if err := x.Sync2(new(PullRequest)); err != nil {
|
||||
return fmt.Errorf("Sync2: %w", err)
|
||||
if err := x.Sync(new(PullRequest)); err != nil {
|
||||
return fmt.Errorf("Sync: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -27,7 +27,7 @@ func UpdateCodeCommentReplies(x *xorm.Engine) error {
|
|||
ReviewID int64 `xorm:"index"`
|
||||
}
|
||||
|
||||
if err := x.Sync2(new(Comment)); err != nil {
|
||||
if err := x.Sync(new(Comment)); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
|
@ -12,5 +12,5 @@ func AddBlockOnOfficialReviewRequests(x *xorm.Engine) error {
|
|||
BlockOnOfficialReviewRequests bool `xorm:"NOT NULL DEFAULT false"`
|
||||
}
|
||||
|
||||
return x.Sync2(new(ProtectedBranch))
|
||||
return x.Sync(new(ProtectedBranch))
|
||||
}
|
||||
|
|
|
@ -41,7 +41,7 @@ func ConvertTaskTypeToString(x *xorm.Engine) error {
|
|||
type HookTask struct {
|
||||
Typ string `xorm:"VARCHAR(16) index"`
|
||||
}
|
||||
if err := x.Sync2(new(HookTask)); err != nil {
|
||||
if err := x.Sync(new(HookTask)); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ func ConvertWebhookTaskTypeToString(x *xorm.Engine) error {
|
|||
type Webhook struct {
|
||||
Type string `xorm:"char(16) index"`
|
||||
}
|
||||
if err := x.Sync2(new(Webhook)); err != nil {
|
||||
if err := x.Sync(new(Webhook)); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ func ConvertTopicNameFrom25To50(x *xorm.Engine) error {
|
|||
UpdatedUnix int64 `xorm:"INDEX updated"`
|
||||
}
|
||||
|
||||
if err := x.Sync2(new(Topic)); err != nil {
|
||||
if err := x.Sync(new(Topic)); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
|
@ -30,8 +30,8 @@ func (grant *OAuth2Grant) TableName() string {
|
|||
}
|
||||
|
||||
func AddScopeAndNonceColumnsToOAuth2Grant(x *xorm.Engine) error {
|
||||
if err := x.Sync2(new(OAuth2Grant)); err != nil {
|
||||
return fmt.Errorf("Sync2: %w", err)
|
||||
if err := x.Sync(new(OAuth2Grant)); err != nil {
|
||||
return fmt.Errorf("Sync: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -16,8 +16,8 @@ func AddUserRedirect(x *xorm.Engine) (err error) {
|
|||
RedirectUserID int64
|
||||
}
|
||||
|
||||
if err := x.Sync2(new(UserRedirect)); err != nil {
|
||||
return fmt.Errorf("Sync2: %w", err)
|
||||
if err := x.Sync(new(UserRedirect)); err != nil {
|
||||
return fmt.Errorf("Sync: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -14,8 +14,8 @@ func AddDismissedReviewColumn(x *xorm.Engine) error {
|
|||
Dismissed bool `xorm:"NOT NULL DEFAULT false"`
|
||||
}
|
||||
|
||||
if err := x.Sync2(new(Review)); err != nil {
|
||||
return fmt.Errorf("Sync2: %w", err)
|
||||
if err := x.Sync(new(Review)); err != nil {
|
||||
return fmt.Errorf("Sync: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -14,8 +14,8 @@ func AddSortingColToProjectBoard(x *xorm.Engine) error {
|
|||
Sorting int8 `xorm:"NOT NULL DEFAULT 0"`
|
||||
}
|
||||
|
||||
if err := x.Sync2(new(ProjectBoard)); err != nil {
|
||||
return fmt.Errorf("Sync2: %w", err)
|
||||
if err := x.Sync(new(ProjectBoard)); err != nil {
|
||||
return fmt.Errorf("Sync: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -15,5 +15,5 @@ func AddSessionTable(x *xorm.Engine) error {
|
|||
Data []byte `xorm:"BLOB"`
|
||||
Expiry timeutil.TimeStamp
|
||||
}
|
||||
return x.Sync2(new(Session))
|
||||
return x.Sync(new(Session))
|
||||
}
|
||||
|
|
|
@ -14,8 +14,8 @@ func AddTimeIDCommentColumn(x *xorm.Engine) error {
|
|||
TimeID int64
|
||||
}
|
||||
|
||||
if err := x.Sync2(new(Comment)); err != nil {
|
||||
return fmt.Errorf("Sync2: %w", err)
|
||||
if err := x.Sync(new(Comment)); err != nil {
|
||||
return fmt.Errorf("Sync: %w", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -26,8 +26,8 @@ func AddRepoTransfer(x *xorm.Engine) error {
|
|||
return err
|
||||
}
|
||||
|
||||
if err := sess.Sync2(new(RepoTransfer)); err != nil {
|
||||
return fmt.Errorf("Sync2: %w", err)
|
||||
if err := sess.Sync(new(RepoTransfer)); err != nil {
|
||||
return fmt.Errorf("Sync: %w", err)
|
||||
}
|
||||
|
||||
return sess.Commit()
|
||||
|
|
|
@ -42,7 +42,7 @@ func RemoveInvalidLabels(x *xorm.Engine) error {
|
|||
LabelID int64 `xorm:"UNIQUE(s)"`
|
||||
}
|
||||
|
||||
if err := x.Sync2(new(Comment), new(Issue), new(Repository), new(Label), new(IssueLabel)); err != nil {
|
||||
if err := x.Sync(new(Comment), new(Issue), new(Repository), new(Label), new(IssueLabel)); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
|
@ -23,8 +23,8 @@ func DeleteOrphanedIssueLabels(x *xorm.Engine) error {
|
|||
return err
|
||||
}
|
||||
|
||||
if err := sess.Sync2(new(IssueLabel)); err != nil {
|
||||
return fmt.Errorf("Sync2: %w", err)
|
||||
if err := sess.Sync(new(IssueLabel)); err != nil {
|
||||
return fmt.Errorf("Sync: %w", err)
|
||||
}
|
||||
|
||||
if _, err := sess.Exec(`DELETE FROM issue_label WHERE issue_label.id IN (
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue