thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

[DB] Ensure forgejo migration up to date (squash)

Browse source 
- Hook Forgejo's `EnsureUpToDate` to Gitea's `EnsureUpToDate`, such that
the Forgejo migrations are also being checked to be up to date.
- I'm not sure how I missed this and if this has caused any problems,
but due to the lack of any open issue about it it seems to not be a big
problem.

(cherry picked from commit 6c65b6dcf6)
This commit is contained in:
Gusted 2023-11-28 21:41:58 +01:00 committed by Earl Warren
parent 58657fff86
commit 6d45c37d84
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.deadcode-out
View file

@ -48,10 +48,6 @@ package "code.gitea.io/gitea/models/forgejo/semver"
func SetVersionString func SetVersionString
func SetVersion func SetVersion
package "code.gitea.io/gitea/models/forgejo_migrations"
func GetCurrentDBVersion
func EnsureUpToDate
package "code.gitea.io/gitea/models/git" package "code.gitea.io/gitea/models/git"
func RemoveDeletedBranchByID func RemoveDeletedBranchByID

2
models/migrations/migrations.go
View file

@ -597,7 +597,7 @@ func EnsureUpToDate(x *xorm.Engine) error {
return fmt.Errorf(`Current database version %d is not equal to the expected version %d. Please run "gitea [--config /path/to/app.ini] migrate" to update the database version`, currentDB, expected) return fmt.Errorf(`Current database version %d is not equal to the expected version %d. Please run "gitea [--config /path/to/app.ini] migrate" to update the database version`, currentDB, expected)
} }
return nil return forgejo_migrations.EnsureUpToDate(x)
} }
// Migrate database to current version // Migrate database to current version