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

Merge pull request '[DB] Ensure forgejo migration up to date (squash)' (#1849) from Gusted/forgejo:forgejo-ensure-forgejo-migration into forgejo-development

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1849
This commit is contained in:
Gusted 2023-11-28 21:40:13 +00:00
commit 57c858f3b4
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