mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-07-25 10:57:37 +00:00
29eddd311b
Upgrade Forgejo to our forked [xorm v1.4.0](https://code.forgejo.org/xorm/xorm/compare/v1.3.9-forgejo.12...v1.4.0), which is now named `code.forgejo.org/xorm/xorm` to reflect the current expectation that it is a permanent fork. A small number of API changes were made recently in https://code.forgejo.org/xorm/xorm/issues/120 which are accounted for in this PR, in addition to the module rename. ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. All work and communication must conform to Forgejo's [AI Agreement](https://codeberg.org/forgejo/governance/src/branch/main/AIAgreement.md). There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] This change will be noticed by a Forgejo user or admin (feature, bug fix, performance, etc.). I suggest to include a release note for this change. - [x] This change is not visible to a Forgejo user or admin (refactor, dependency upgrade, etc.). I think there is no need to add a release note for this change. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/12639 Reviewed-by: Otto <otto@codeberg.org>
47 lines
1.1 KiB
Go
47 lines
1.1 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package v1_15
|
|
|
|
import (
|
|
"forgejo.org/models/gitea_migrations/base"
|
|
|
|
"code.forgejo.org/xorm/xorm"
|
|
)
|
|
|
|
func DropWebhookColumns(x *xorm.Engine) error {
|
|
// Make sure the columns exist before dropping them
|
|
type Webhook struct {
|
|
Signature string `xorm:"TEXT"`
|
|
IsSSL bool `xorm:"is_ssl"`
|
|
}
|
|
if err := x.Sync(new(Webhook)); err != nil {
|
|
return err
|
|
}
|
|
|
|
type HookTask struct {
|
|
Typ string `xorm:"VARCHAR(16) index"`
|
|
URL string `xorm:"TEXT"`
|
|
Signature string `xorm:"TEXT"`
|
|
HTTPMethod string `xorm:"http_method"`
|
|
ContentType int
|
|
IsSSL bool
|
|
}
|
|
if err := x.Sync(new(HookTask)); err != nil {
|
|
return err
|
|
}
|
|
|
|
sess := x.NewSession()
|
|
defer sess.Close()
|
|
if err := sess.Begin(); err != nil {
|
|
return err
|
|
}
|
|
if err := base.DropTableColumns(sess, "webhook", "signature", "is_ssl"); err != nil {
|
|
return err
|
|
}
|
|
if err := base.DropTableColumns(sess, "hook_task", "typ", "url", "signature", "http_method", "content_type", "is_ssl"); err != nil {
|
|
return err
|
|
}
|
|
|
|
return sess.Commit()
|
|
}
|