8000 Explicitly not update indexes when sync database schemas (#34281) (#3… · go-gitea/gitea@5546b42 · GitHub
  • [go: up one dir, main page]
    Skip to content

    Commit 5546b42

    Browse files
    lunnywxiaoguang
    lunny
    and
    wxiaoguang
    authored
    Explicitly not update indexes when sync database schemas (#34281) (#34295)
    Fix #34275 Backport #34281 --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
    1 parent 4f6d09f commit 5546b42

    File tree

    7 files changed

    +35
    -8
    lines changed

    7 files changed

    +35
    -8
    lines changed

    ‎models/migrations/v1_23/v299.go

    Lines changed: 5 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -14,5 +14,9 @@ func AddContentVersionToIssueAndComment(x *xorm.Engine) error {
    1414
    ContentVersion int `xorm:"NOT NULL DEFAULT 0"`
    1515
    }
    1616

    17-
    return x.Sync(new(Comment), new(Issue))
    17+
    _, err := x.SyncWithOptions(xorm.SyncOptions{
    18+
    IgnoreConstrains: true,
    19+
    IgnoreIndices: true,
    20+
    }, new(Comment), new(Issue))
    21+
    return err
    1822
    }

    ‎models/migrations/v1_23/v300.go

    Lines changed: 5 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -13,5 +13,9 @@ func AddForcePushBranchProtection(x *xorm.Engine) error {
    1313
    ForcePushAllowlistTeamIDs []int64 `xorm:"JSON TEXT"`
    1414
    ForcePushAllowlistDeployKeys bool `xorm:"NOT NULL DEFAULT false"`
    1515
    }
    16-
    return x.Sync(new(ProtectedBranch))
    16+
    _, err := x.SyncWithOptions(xorm.SyncOptions{
    17+
    IgnoreConstrains: true,
    18+
    IgnoreIndices: true,
    19+
    }, new(ProtectedBranch))
    10000 20+
    return err
    1721
    }

    ‎models/migrations/v1_23/v301.go

    Lines changed: 5 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -10,5 +10,9 @@ func AddSkipSecondaryAuthColumnToOAuth2ApplicationTable(x *xorm.Engine) error {
    1010
    type oauth2Application struct {
    1111
    SkipSecondaryAuthorization bool `xorm:"NOT NULL DEFAULT FALSE"`
    1212
    }
    13-
    return x.Sync(new(oauth2Application))
    13+
    _, err := x.SyncWithOptions(xorm.SyncOptions{
    14+
    IgnoreConstrains: true,
    15+
    IgnoreIndices: true,
    16+
    }, new(oauth2Application))
    17+
    return err
    1418
    }

    ‎models/migrations/v1_23/v303.go

    Lines changed: 5 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -19,5 +19,9 @@ func AddCommentMetaDataColumn(x *xorm.Engine) error {
    1919
    CommentMetaData *CommentMetaData `xorm:"JSON TEXT"` // put all non-index metadata in a single field
    2020
    }
    2121

    22-
    return x.Sync(new(Comment))
    22+
    _, err := x.SyncWithOptions(xorm.SyncOptions{
    23+
    IgnoreConstrains: true,
    24+
    IgnoreIndices: true,
    25+
    }, new(Comment))
    26+
    return err
    2327
    }

    ‎models/migrations/v1_23/v306.go

    Lines changed: 5 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -9,5 +9,9 @@ func AddBlockAdminMergeOverrideBranchProtection(x *xorm.Engine) error {
    99
    type ProtectedBranch struct {
    1010
    BlockAdminMergeOverride bool `xorm:"NOT NULL DEFAULT false"`
    1111
    }
    12-
    return x.Sync(new(ProtectedBranch))
    12+
    _, err := x.SyncWithOptions(xorm.SyncOptions{
    13+
    IgnoreConstrains: true,
    14+
    IgnoreIndices: true,
    15+
    }, new(ProtectedBranch))
    16+
    return err
    1317
    }

    ‎models/migrations/v1_23/v310.go

    Lines changed: 5 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -12,5 +12,9 @@ func AddPriorityToProtectedBranch(x *xorm.Engine) error {
    1212
    Priority int64 `xorm:"NOT NULL DEFAULT 0"`
    1313
    }
    1414

    15-
    return x.Sync(new(ProtectedBranch))
    15+
    _, err := x.SyncWithOptions(xorm.SyncOptions{
    16+
    IgnoreConstrains: true,
    17+
    IgnoreIndices: true,
    18+
    }, new(ProtectedBranch))
    19+
    return err
    1620
    }

    ‎models/migrations/v1_23/v311.go

    Lines changed: 5 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -11,6 +11,9 @@ func AddTimeEstimateColumnToIssueTable(x *xorm.Engine) error {
    1111
    type Issue struct {
    1212
    TimeEstimate int64 `xorm:"NOT NULL DEFAULT 0"`
    1313
    }
    14-
    15-
    return x.Sync(new(Issue))
    14+
    _, err := x.SyncWithOptions(xorm.SyncOptions{
    15+
    IgnoreConstrains: true,
    16+
    IgnoreIndices: true,
    17+
    }, new(Issue))
    18+
    return err
    1619
    }

    0 commit comments

    Comments
     (0)
    0