diff --git a/openflare_server/model/migrate/v10.go b/openflare_server/model/migrate/v10.go index 517f629d..9436acc8 100644 --- a/openflare_server/model/migrate/v10.go +++ b/openflare_server/model/migrate/v10.go @@ -18,9 +18,6 @@ func V10() Migration { } func migrateV10(ctx Context, db *gorm.DB, backend string) error { - if err := ctx.ApplyCurrentSchema(db, backend); err != nil { - return err - } return ctx.EnsureDefaultGitHubAuthSource(db) } diff --git a/openflare_server/model/migrate/v11.go b/openflare_server/model/migrate/v11.go index d59c59c1..a0213da0 100644 --- a/openflare_server/model/migrate/v11.go +++ b/openflare_server/model/migrate/v11.go @@ -18,7 +18,7 @@ func V11() Migration { } func migrateV11(ctx Context, db *gorm.DB, backend string) error { - return ctx.ApplyCurrentSchema(db, backend) + return nil } func validateV11(ctx Context, db *gorm.DB, backend string) error { diff --git a/openflare_server/model/migrate/v12.go b/openflare_server/model/migrate/v12.go index 1aa50f94..38b85687 100644 --- a/openflare_server/model/migrate/v12.go +++ b/openflare_server/model/migrate/v12.go @@ -18,7 +18,7 @@ func V12() Migration { } func migrateV12(ctx Context, db *gorm.DB, backend string) error { - return ctx.ApplyCurrentSchema(db, backend) + return nil } func validateV12(ctx Context, db *gorm.DB, backend string) error { diff --git a/openflare_server/model/migrate/v13.go b/openflare_server/model/migrate/v13.go index c5f4e6f8..7aa43dab 100644 --- a/openflare_server/model/migrate/v13.go +++ b/openflare_server/model/migrate/v13.go @@ -18,9 +18,6 @@ func V13() Migration { } func migrateV13(ctx Context, db *gorm.DB, backend string) error { - if err := ctx.ApplyCurrentSchema(db, backend); err != nil { - return err - } return ctx.EnsureDefaultWAFRuleGroup(db) } diff --git a/openflare_server/model/migrate/v14.go b/openflare_server/model/migrate/v14.go index 36fcc7b5..6df310a1 100644 --- a/openflare_server/model/migrate/v14.go +++ b/openflare_server/model/migrate/v14.go @@ -18,9 +18,6 @@ func V14() Migration { } func migrateV14(ctx Context, db *gorm.DB, backend string) error { - if err := ctx.ApplyCurrentSchema(db, backend); err != nil { - return err - } return ctx.EnsureDefaultWAFRuleGroup(db) } diff --git a/openflare_server/model/migrate/v15.go b/openflare_server/model/migrate/v15.go index 5c1011de..486e2dd6 100644 --- a/openflare_server/model/migrate/v15.go +++ b/openflare_server/model/migrate/v15.go @@ -30,7 +30,7 @@ func (nodeV15) TableName() string { } func migrateV15(ctx Context, db *gorm.DB, backend string) error { - return ctx.ApplyCurrentSchema(db, backend) + return nil } func validateV15(ctx Context, db *gorm.DB, backend string) error { diff --git a/openflare_server/model/migrate/v16.go b/openflare_server/model/migrate/v16.go index 9a087ee2..6189e668 100644 --- a/openflare_server/model/migrate/v16.go +++ b/openflare_server/model/migrate/v16.go @@ -46,9 +46,6 @@ func (proxyRouteV16) TableName() string { } func migrateV16(ctx Context, db *gorm.DB, backend string) error { - if err := ctx.ApplyCurrentSchema(db, backend); err != nil { - return err - } if err := db.AutoMigrate(&tunnelV16{}); err != nil { return fmt.Errorf("auto migrate tunnelV16: %w", err) } diff --git a/openflare_server/model/migrate/v17.go b/openflare_server/model/migrate/v17.go index 6efc70be..d61311bc 100644 --- a/openflare_server/model/migrate/v17.go +++ b/openflare_server/model/migrate/v17.go @@ -35,7 +35,7 @@ func (wafRuleGroupV17) TableName() string { } func migrateV17(ctx Context, db *gorm.DB, backend string) error { - return ctx.ApplyCurrentSchema(db, backend) + return nil } func validateV17(ctx Context, db *gorm.DB, backend string) error { diff --git a/openflare_server/model/migrate/v18.go b/openflare_server/model/migrate/v18.go index 09e45ab6..aa609053 100644 --- a/openflare_server/model/migrate/v18.go +++ b/openflare_server/model/migrate/v18.go @@ -31,7 +31,7 @@ func (wafIPGroupV18) TableName() string { } func migrateV18(ctx Context, db *gorm.DB, backend string) error { - return ctx.ApplyCurrentSchema(db, backend) + return nil } func validateV18(ctx Context, db *gorm.DB, backend string) error { diff --git a/openflare_server/model/migrate/v19.go b/openflare_server/model/migrate/v19.go index 6875702b..e330385f 100644 --- a/openflare_server/model/migrate/v19.go +++ b/openflare_server/model/migrate/v19.go @@ -64,11 +64,6 @@ func migrateV19(ctx Context, db *gorm.DB, backend string) error { slog.Info("dropped tunnel_id column from proxy_routes") } - slog.Info("v19: starting ApplyCurrentSchema (auto-migrate all tables)") - if err := ctx.ApplyCurrentSchema(db, backend); err != nil { - return err - } - slog.Info("v19: ApplyCurrentSchema completed") return nil } diff --git a/openflare_server/model/migrate/v20.go b/openflare_server/model/migrate/v20.go index 40ce145a..c442b690 100644 --- a/openflare_server/model/migrate/v20.go +++ b/openflare_server/model/migrate/v20.go @@ -42,9 +42,6 @@ func migrateV20(ctx Context, db *gorm.DB, backend string) error { return err } } - if err := ctx.ApplyCurrentSchema(db, backend); err != nil { - return err - } return validateV20(ctx, db, backend) } diff --git a/openflare_server/model/migrate/v8.go b/openflare_server/model/migrate/v8.go index 178b57ef..27b2d75c 100644 --- a/openflare_server/model/migrate/v8.go +++ b/openflare_server/model/migrate/v8.go @@ -18,9 +18,6 @@ func V8() Migration { } func migrateV8(ctx Context, db *gorm.DB, backend string) error { - if err := ctx.ApplyCurrentSchema(db, backend); err != nil { - return err - } if err := ctx.BackfillOriginsFromProxyRoutes(db); err != nil { return err }