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>
107 lines
3.3 KiB
Go
107 lines
3.3 KiB
Go
// Copyright 2025 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package forgejo_migrations_legacy
|
|
|
|
import (
|
|
"time"
|
|
|
|
"forgejo.org/models/gitea_migrations/base"
|
|
"forgejo.org/modules/forgefed"
|
|
"forgejo.org/modules/log"
|
|
"forgejo.org/modules/timeutil"
|
|
|
|
"code.forgejo.org/xorm/xorm"
|
|
)
|
|
|
|
func MigrateNormalizedFederatedURI(x *xorm.Engine) error {
|
|
// Update schema
|
|
type FederatedUser struct {
|
|
ID int64 `xorm:"pk autoincr"`
|
|
UserID int64 `xorm:"NOT NULL"`
|
|
ExternalID string `xorm:"UNIQUE(federation_user_mapping) NOT NULL"`
|
|
FederationHostID int64 `xorm:"UNIQUE(federation_user_mapping) NOT NULL"`
|
|
NormalizedOriginalURL string
|
|
}
|
|
type User struct {
|
|
ID int64 `xorm:"pk autoincr"`
|
|
NormalizedFederatedURI string
|
|
}
|
|
type FederationHost struct {
|
|
ID int64 `xorm:"pk autoincr"`
|
|
HostFqdn string `xorm:"host_fqdn UNIQUE INDEX VARCHAR(255) NOT NULL"`
|
|
NodeInfo NodeInfo `xorm:"extends NOT NULL"`
|
|
HostPort uint16 `xorm:"NOT NULL DEFAULT 443"`
|
|
HostSchema string `xorm:"NOT NULL DEFAULT 'https'"`
|
|
LatestActivity time.Time `xorm:"NOT NULL"`
|
|
Created timeutil.TimeStamp `xorm:"created"`
|
|
Updated timeutil.TimeStamp `xorm:"updated"`
|
|
}
|
|
if err := x.Sync(new(User), new(FederatedUser), new(FederationHost)); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Migrate
|
|
sessMigration := x.NewSession()
|
|
defer sessMigration.Close()
|
|
if err := sessMigration.Begin(); err != nil {
|
|
return err
|
|
}
|
|
federatedUsers := make([]*FederatedUser, 0)
|
|
err := sessMigration.OrderBy("id").Find(&federatedUsers)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
for _, federatedUser := range federatedUsers {
|
|
if federatedUser.NormalizedOriginalURL != "" {
|
|
log.Trace("migration[30]: FederatedUser was already migrated %v", federatedUser)
|
|
} else {
|
|
user := &User{}
|
|
has, err := sessMigration.Where("id=?", federatedUser.UserID).Get(user)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if !has {
|
|
log.Debug("migration[30]: User missing for federated user: %v", federatedUser)
|
|
_, err := sessMigration.Delete(federatedUser)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
// Migrate User.NormalizedFederatedURI -> FederatedUser.NormalizedOriginalUrl
|
|
sql := "UPDATE `federated_user` SET `normalized_original_url` = ? WHERE `id` = ?"
|
|
if _, err := sessMigration.Exec(sql, user.NormalizedFederatedURI, federatedUser.FederationHostID); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Migrate (Port, Schema) FederatedUser.NormalizedOriginalUrl -> FederationHost.(Port, Schema)
|
|
actorID, err := forgefed.NewActorID(user.NormalizedFederatedURI)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
sql = "UPDATE `federation_host` SET `host_port` = ?, `host_schema` = ? WHERE `id` = ?"
|
|
if _, err := sessMigration.Exec(sql, actorID.HostPort, actorID.HostSchema, federatedUser.FederationHostID); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if err := sessMigration.Commit(); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Drop User.NormalizedFederatedURI field in extra transaction
|
|
sessSchema := x.NewSession()
|
|
defer sessSchema.Close()
|
|
if err := sessSchema.Begin(); err != nil {
|
|
return err
|
|
}
|
|
if err := base.DropTableColumns(sessSchema, "user", "normalized_federated_uri"); err != nil {
|
|
return err
|
|
}
|
|
return sessSchema.Commit()
|
|
}
|