From 78fe589fcfde8c9e3d903dadc6c4b3b4cdc29bcd Mon Sep 17 00:00:00 2001 From: StarFleetCPTN Date: Tue, 8 Apr 2025 21:00:41 -0700 Subject: [PATCH] refactor: Remove recovery migration files for transfer_configs, notification_services, and auth_providers - Deleted migration files that handled recovery for inconsistent states in transfer_configs, notification_services, and auth_providers tables. - Updated migration management to reflect the removal of these recovery steps, ensuring cleaner migration logic. --- ...gs_rename.go => 012a_recover_transfer_configs_rename.go} | 6 +++--- ...name.go => 012b_recover_notification_services_rename.go} | 6 +++--- ...ders_rename.go => 012c_recover_auth_providers_rename.go} | 6 +++--- internal/db/migrations/migrations.go | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) rename internal/db/migrations/{011a_recover_transfer_configs_rename.go => 012a_recover_transfer_configs_rename.go} (91%) rename internal/db/migrations/{011b_recover_notification_services_rename.go => 012b_recover_notification_services_rename.go} (90%) rename internal/db/migrations/{011c_recover_auth_providers_rename.go => 012c_recover_auth_providers_rename.go} (90%) diff --git a/internal/db/migrations/011a_recover_transfer_configs_rename.go b/internal/db/migrations/012a_recover_transfer_configs_rename.go similarity index 91% rename from internal/db/migrations/011a_recover_transfer_configs_rename.go rename to internal/db/migrations/012a_recover_transfer_configs_rename.go index cd6dcf3..8cabb16 100644 --- a/internal/db/migrations/011a_recover_transfer_configs_rename.go +++ b/internal/db/migrations/012a_recover_transfer_configs_rename.go @@ -12,9 +12,9 @@ import ( // table might have been left renamed as _transfer_configs_old. func RecoverTransferConfigsRename() *gormigrate.Migration { return &gormigrate.Migration{ - ID: "011a_recover_transfer_configs_rename", + ID: "012a_recover_transfer_configs_rename", Migrate: func(tx *gorm.DB) error { - fmt.Println("Running migration 011a: Checking for transfer_configs rename recovery...") + fmt.Println("Running migration 012a: Checking for transfer_configs rename recovery...") var oldTableExists int tx.Raw("SELECT count(*) FROM sqlite_master WHERE type='table' AND name='_transfer_configs_old'").Scan(&oldTableExists) @@ -40,7 +40,7 @@ func RecoverTransferConfigsRename() *gormigrate.Migration { }, Rollback: func(tx *gorm.DB) error { // Rollback doesn't make sense for a recovery step. - fmt.Println("Rollback for migration 011a_recover_transfer_configs_rename is not applicable.") + fmt.Println("Rollback for migration 012a_recover_transfer_configs_rename is not applicable.") return nil }, } diff --git a/internal/db/migrations/011b_recover_notification_services_rename.go b/internal/db/migrations/012b_recover_notification_services_rename.go similarity index 90% rename from internal/db/migrations/011b_recover_notification_services_rename.go rename to internal/db/migrations/012b_recover_notification_services_rename.go index 5966725..15dfdeb 100644 --- a/internal/db/migrations/011b_recover_notification_services_rename.go +++ b/internal/db/migrations/012b_recover_notification_services_rename.go @@ -12,9 +12,9 @@ import ( // table might have been left renamed as _notification_services_old. func RecoverNotificationServicesRename() *gormigrate.Migration { return &gormigrate.Migration{ - ID: "011b_recover_notification_services_rename", + ID: "012b_recover_notification_services_rename", Migrate: func(tx *gorm.DB) error { - fmt.Println("Running migration 011b: Checking for notification_services rename recovery...") + fmt.Println("Running migration 012b: Checking for notification_services rename recovery...") var oldTableExists int tx.Raw("SELECT count(*) FROM sqlite_master WHERE type='table' AND name='_notification_services_old'").Scan(&oldTableExists) @@ -38,7 +38,7 @@ func RecoverNotificationServicesRename() *gormigrate.Migration { }, Rollback: func(tx *gorm.DB) error { // Rollback doesn't make sense for a recovery step. - fmt.Println("Rollback for migration 011b_recover_notification_services_rename is not applicable.") + fmt.Println("Rollback for migration 012b_recover_notification_services_rename is not applicable.") return nil }, } diff --git a/internal/db/migrations/011c_recover_auth_providers_rename.go b/internal/db/migrations/012c_recover_auth_providers_rename.go similarity index 90% rename from internal/db/migrations/011c_recover_auth_providers_rename.go rename to internal/db/migrations/012c_recover_auth_providers_rename.go index 510ba97..071fb8f 100644 --- a/internal/db/migrations/011c_recover_auth_providers_rename.go +++ b/internal/db/migrations/012c_recover_auth_providers_rename.go @@ -12,9 +12,9 @@ import ( // table might have been left renamed as _auth_providers_old. func RecoverAuthProvidersRename() *gormigrate.Migration { return &gormigrate.Migration{ - ID: "011c_recover_auth_providers_rename", + ID: "012c_recover_auth_providers_rename", Migrate: func(tx *gorm.DB) error { - fmt.Println("Running migration 011c: Checking for auth_providers rename recovery...") + fmt.Println("Running migration 012c: Checking for auth_providers rename recovery...") var oldTableExists int tx.Raw("SELECT count(*) FROM sqlite_master WHERE type='table' AND name='_auth_providers_old'").Scan(&oldTableExists) @@ -38,7 +38,7 @@ func RecoverAuthProvidersRename() *gormigrate.Migration { }, Rollback: func(tx *gorm.DB) error { // Rollback doesn't make sense for a recovery step. - fmt.Println("Rollback for migration 011c_recover_auth_providers_rename is not applicable.") + fmt.Println("Rollback for migration 012c_recover_auth_providers_rename is not applicable.") return nil }, } diff --git a/internal/db/migrations/migrations.go b/internal/db/migrations/migrations.go index 5367941..4df11e8 100644 --- a/internal/db/migrations/migrations.go +++ b/internal/db/migrations/migrations.go @@ -22,10 +22,10 @@ func GetMigrations(db *gorm.DB) *gormigrate.Gormigrate { AddRcloneTables(), // 009 AddRcloneCommandToConfig(), // 010 AddAuthProviders(), // 011 - RecoverTransferConfigsRename(), // 011a - RecoverNotificationServicesRename(), // 011b - RecoverAuthProvidersRename(), // 011c AlterBooleanDefaults(), // 012 + RecoverTransferConfigsRename(), // 012a + RecoverNotificationServicesRename(), // 012b + RecoverAuthProvidersRename(), // 012c CleanupInvalidBooleans(), // 013 )