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

@ -33,8 +33,8 @@ func FixLanguageStatsToSaveSize(x *xorm.Engine) error {
IndexerType RepoIndexerType `xorm:"INDEX(s) NOT NULL DEFAULT 0"`
}
if err := x.Sync2(new(LanguageStat)); err != nil {
return fmt.Errorf("Sync2: %w", err)
if err := x.Sync(new(LanguageStat)); err != nil {
return fmt.Errorf("Sync: %w", err)
}
x.Delete(&RepoIndexerStatus{IndexerType: RepoIndexerTypeStats})

View file

@ -14,8 +14,8 @@ func AddKeepActivityPrivateUserColumn(x *xorm.Engine) error {
KeepActivityPrivate bool `xorm:"NOT NULL DEFAULT false"`
}
if err := x.Sync2(new(User)); err != nil {
return fmt.Errorf("Sync2: %w", err)
if err := x.Sync(new(User)); err != nil {
return fmt.Errorf("Sync: %w", err)
}
return nil
}

View file

@ -17,7 +17,7 @@ func IncreaseLanguageField(x *xorm.Engine) error {
Language string `xorm:"VARCHAR(50) UNIQUE(s) INDEX NOT NULL"`
}
if err := x.Sync2(new(LanguageStat)); err != nil {
if err := x.Sync(new(LanguageStat)); err != nil {
return err
}

View file

@ -32,7 +32,7 @@ func AddProjectsInfo(x *xorm.Engine) error {
UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
if err := x.Sync2(new(Project)); err != nil {
if err := x.Sync(new(Project)); err != nil {
return err
}
@ -41,7 +41,7 @@ func AddProjectsInfo(x *xorm.Engine) error {
ProjectID int64
}
if err := x.Sync2(new(Comment)); err != nil {
if err := x.Sync(new(Comment)); err != nil {
return err
}
@ -51,7 +51,7 @@ func AddProjectsInfo(x *xorm.Engine) error {
NumClosedProjects int `xorm:"NOT NULL DEFAULT 0"`
}
if err := x.Sync2(new(Repository)); err != nil {
if err := x.Sync(new(Repository)); err != nil {
return err
}
@ -63,7 +63,7 @@ func AddProjectsInfo(x *xorm.Engine) error {
ProjectBoardID int64 `xorm:"INDEX"`
}
if err := x.Sync2(new(ProjectIssue)); err != nil {
if err := x.Sync(new(ProjectIssue)); err != nil {
return err
}
@ -79,5 +79,5 @@ func AddProjectsInfo(x *xorm.Engine) error {
UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
return x.Sync2(new(ProjectBoard))
return x.Sync(new(ProjectBoard))
}

View file

@ -78,7 +78,7 @@ func CreateReviewsForCodeComments(x *xorm.Engine) error {
RefIsPull bool
}
if err := x.Sync2(new(Review), new(Comment)); err != nil {
if err := x.Sync(new(Review), new(Comment)); err != nil {
return err
}

View file

@ -17,8 +17,8 @@ func AddCreatedAndUpdatedToMilestones(x *xorm.Engine) error {
UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
if err := x.Sync2(new(Milestone)); err != nil {
return fmt.Errorf("Sync2: %w", err)
if err := x.Sync(new(Milestone)); err != nil {
return fmt.Errorf("Sync: %w", err)
}
return nil
}

View file

@ -77,14 +77,14 @@ func SetDefaultPasswordToArgon2(x *xorm.Engine) error {
type User struct {
PasswdHashAlgo string `xorm:"NOT NULL DEFAULT 'argon2'"`
}
return x.Sync2(new(User))
return x.Sync(new(User))
}
column := table.GetColumn("passwd_hash_algo")
if column == nil {
type User struct {
PasswdHashAlgo string `xorm:"NOT NULL DEFAULT 'argon2'"`
}
return x.Sync2(new(User))
return x.Sync(new(User))
}
tempTableName := "tmp_recreate__user"

View file

@ -9,5 +9,5 @@ func AddTrustModelToRepository(x *xorm.Engine) error {
type Repository struct {
TrustModel int
}
return x.Sync2(new(Repository))
return x.Sync(new(Repository))
}

View file

@ -16,9 +16,9 @@ func AddTeamReviewRequestSupport(x *xorm.Engine) error {
AssigneeTeamID int64 `xorm:"NOT NULL DEFAULT 0"`
}
if err := x.Sync2(new(Review)); err != nil {
if err := x.Sync(new(Review)); err != nil {
return err
}
return x.Sync2(new(Comment))
return x.Sync(new(Comment))
}

View file

@ -16,7 +16,7 @@ func AddTimeStamps(x *xorm.Engine) error {
type Star struct {
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
}
if err := x.Sync2(new(Star)); err != nil {
if err := x.Sync(new(Star)); err != nil {
return err
}
@ -25,7 +25,7 @@ func AddTimeStamps(x *xorm.Engine) error {
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
if err := x.Sync2(new(Label)); err != nil {
if err := x.Sync(new(Label)); err != nil {
return err
}
@ -33,7 +33,7 @@ func AddTimeStamps(x *xorm.Engine) error {
type Follow struct {
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
}
if err := x.Sync2(new(Follow)); err != nil {
if err := x.Sync(new(Follow)); err != nil {
return err
}
@ -42,7 +42,7 @@ func AddTimeStamps(x *xorm.Engine) error {
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
if err := x.Sync2(new(Watch)); err != nil {
if err := x.Sync(new(Watch)); err != nil {
return err
}
@ -51,5 +51,5 @@ func AddTimeStamps(x *xorm.Engine) error {
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"`
}
return x.Sync2(new(Collaboration))
return x.Sync(new(Collaboration))
}