diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2023-06-24 16:20:08 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-24 08:20:08 +0000 |
| commit | 71446eee99eaa78d65a85f4986b0466f48bc3d27 (patch) | |
| tree | ed381e59528dfc6e7a7f02d29f90a048d4280710 /models | |
| parent | be47015229cd447040241135e18cb15be589e2cf (diff) | |
| download | gitea-71446eee99eaa78d65a85f4986b0466f48bc3d27.tar.gz gitea-71446eee99eaa78d65a85f4986b0466f48bc3d27.zip | |
Fix wrong warn messages in migration steps (#25475)
The recent change on xorm for `Sync` is it will not warn when database
have columns which is not listed on struct. So we just need this warn
logs when `Sync` the whole database but not in the migrations Sync.
This PR will remove almost unnecessary warning logs on migrations.
Now below logs in CI will disappear.
```log
2023/06/23 17:51:32 models/db/engine.go:191:InitEngineWithMigration() [W] Table gtestschema.project has column creator_id but struct has not related field
2023/06/23 17:51:32 models/db/engine.go:191:InitEngineWithMigration() [W] Table gtestschema.project has column is_closed but struct has not related field
2023/06/23 17:51:32 models/db/engine.go:191:InitEngineWithMigration() [W] Table gtestschema.project has column board_type but struct has not related field
2023/06/23 17:51:32 models/db/engine.go:191:InitEngineWithMigration() [W] Table gtestschema.project has column type but struct has not related field
2023/06/23 17:51:32 models/db/engine.go:191:InitEngineWithMigration() [W] Table gtestschema.project has column closed_date_unix but struct has not related field
2023/06/23 17:51:32 models/db/engine.go:191:InitEngineWithMigration() [W] Table gtestschema.project has column created_unix but struct has not related field
2023/06/23 17:51:32 models/db/engine.go:191:InitEngineWithMigration() [W] Table gtestschema.project has column updated_unix but struct has not related field
2023/06/23 17:51:32 models/db/engine.go:191:InitEngineWithMigration() [W] Table gtestschema.project has column card_type but struct has not related field
```
Diffstat (limited to 'models')
| -rwxr-xr-x | models/db/engine.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/models/db/engine.go b/models/db/engine.go index 56dd209fd7..3eb16f8042 100755 --- a/models/db/engine.go +++ b/models/db/engine.go @@ -123,7 +123,10 @@ func newXORMEngine() (*xorm.Engine, error) { // SyncAllTables sync the schemas of all tables, is required by unit test code func SyncAllTables() error { - return x.StoreEngine("InnoDB").Sync2(tables...) + _, err := x.StoreEngine("InnoDB").SyncWithOptions(xorm.SyncOptions{ + WarnIfDatabaseColumnMissed: true, + }, tables...) + return err } // InitEngine initializes the xorm.Engine and sets it as db.DefaultContext |