Moved all migrations into one target, simplified migration logic

mpretty-cyro · Mar 5, 2026 · Aug 7, 2025 · Aug 7, 2025 · Aug 7, 2025 · Aug 8, 2025
commit 08d01a52ec379f792e3b1a78ea1c40bda20394ce
diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj
diff --git a/Session/Meta/AppDelegate.swift b/Session/Meta/AppDelegate.swift
@@ -70,7 +70,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         self.loadingViewController = LoadingViewController()
 
         AppSetup.setupEnvironment(
-            additionalMigrationTargets: [DeprecatedUIKitMigrationTarget.self],
             appSpecificBlock: { [dependencies] in
                 Log.setup(with: Logger(primaryPrefix: "Session", using: dependencies))
                 Log.info(.cat, "Setting up environment.")
@@ -222,7 +221,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
             // Dispatch async so things can continue to be progressed if a migration does need to run
             DispatchQueue.global(qos: .userInitiated).async { [weak self, dependencies] in
                 AppSetup.runPostSetupMigrations(
-                    additionalMigrationTargets: [DeprecatedUIKitMigrationTarget.self],
                     migrationProgressChanged: { progress, minEstimatedTotalTime in
                         self?.loadingViewController?.updateProgress(
                             progress: progress,
@@ -606,7 +604,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
                         // The re-run the migration (should succeed since there is no data)
                         AppSetup.runPostSetupMigrations(
-                            additionalMigrationTargets: [DeprecatedUIKitMigrationTarget.self],
                             migrationProgressChanged: { [weak self] progress, minEstimatedTotalTime in
                                 self?.loadingViewController?.updateProgress(
                                     progress: progress,

diff --git a/SessionMessagingKit/Configuration.swift b/SessionMessagingKit/Configuration.swift
@@ -2,58 +2,53 @@ import Foundation
 import GRDB
 import SessionUtilitiesKit
 
-public enum SNMessagingKit: MigratableTarget { // Just to make the external API nice
-    public static func migrations() -> TargetMigrations {
-        return TargetMigrations(
-            identifier: .messagingKit,
-            migrations: [
-                [
-                    _001_InitialSetupMigration.self,
-                    _002_SetupStandardJobs.self
-                ],  // Initial DB Creation
-                [
-                    _003_YDBToGRDBMigration.self
-                ],  // YDB to GRDB Migration
-                [
-                    _004_RemoveLegacyYDB.self
-                ],  // Legacy DB removal
-                [
-                    _005_FixDeletedMessageReadState.self,
-                    _006_FixHiddenModAdminSupport.self,
-                    _007_HomeQueryOptimisationIndexes.self
-                ],  // Add job priorities
-                [
-                    _008_EmojiReacts.self,
-                    _009_OpenGroupPermission.self,
-                    _010_AddThreadIdToFTS.self
-                ],  // Fix thread FTS
-                [
-                    _011_AddPendingReadReceipts.self,
-                    _012_AddFTSIfNeeded.self,
-                    _013_SessionUtilChanges.self,
-                    _014_GenerateInitialUserConfigDumps.self,
-                    _015_BlockCommunityMessageRequests.self,
-                    _016_MakeBrokenProfileTimestampsNullable.self,
-                    _017_RebuildFTSIfNeeded_2_4_5.self,
-                    _018_DisappearingMessagesConfiguration.self,
-                    _019_ScheduleAppUpdateCheckJob.self,
-                    _020_AddMissingWhisperFlag.self,
-                    _021_ReworkRecipientState.self,
-                    _022_GroupsRebuildChanges.self,
-                    _023_GroupsExpiredFlag.self,
-                    _024_FixBustedInteractionVariant.self,
-                    _025_DropLegacyClosedGroupKeyPairTable.self,
-                    _026_MessageDeduplicationTable.self
-                ],
-                [],  // Renamed `Setting` to `KeyValueStore`
-                [
-                    _027_MoveSettingsToLibSession.self,
-                    _028_RenameAttachments.self,
-                    _029_AddProMessageFlag.self
-                ]
-            ]
-        )
-    }
+public enum SNMessagingKit { // Just to make the external API nice
+    public static let migrations: [Migration.Type] = [
+        _001_SUK_InitialSetupMigration.self,
+        _002_SUK_SetupStandardJobs.self,
+        _003_SUK_YDBToGRDBMigration.self,
+        _004_SNK_InitialSetupMigration.self,
+        _005_SNK_SetupStandardJobs.self,
+        _006_SMK_InitialSetupMigration.self,
+        _007_SMK_SetupStandardJobs.self,
+        _008_SNK_YDBToGRDBMigration.self,
+        _009_SMK_YDBToGRDBMigration.self,
+        _010_FlagMessageHashAsDeletedOrInvalid.self,
+        _011_RemoveLegacyYDB.self,
+        _012_AddJobPriority.self,
+        _013_FixDeletedMessageReadState.self,
+        _014_FixHiddenModAdminSupport.self,
+        _015_HomeQueryOptimisationIndexes.self,
+        _016_ThemePreferences.self,
+        _017_EmojiReacts.self,
+        _018_OpenGroupPermission.self,
+        _019_AddThreadIdToFTS.self,
+        _020_AddJobUniqueHash.self,
+        _021_AddSnodeReveivedMessageInfoPrimaryKey.self,
+        _022_DropSnodeCache.self,
+        _023_SplitSnodeReceivedMessageInfo.self,
+        _024_ResetUserConfigLastHashes.self,
+        _025_AddPendingReadReceipts.self,
+        _026_AddFTSIfNeeded.self,
+        _027_SessionUtilChanges.self,
+        _028_GenerateInitialUserConfigDumps.self,
+        _029_BlockCommunityMessageRequests.self,
+        _030_MakeBrokenProfileTimestampsNullable.self,
+        _031_RebuildFTSIfNeeded_2_4_5.self,
+        _032_DisappearingMessagesConfiguration.self,
+        _033_ScheduleAppUpdateCheckJob.self,
+        _034_AddMissingWhisperFlag.self,
+        _035_ReworkRecipientState.self,
+        _036_GroupsRebuildChanges.self,
+        _037_GroupsExpiredFlag.self,
+        _038_FixBustedInteractionVariant.self,
+        _039_DropLegacyClosedGroupKeyPairTable.self,
+        _040_MessageDeduplicationTable.self,
+        _041_RenameTableSettingToKeyValueStore.self,
+        _042_MoveSettingsToLibSession.self,
+        _043_RenameAttachments.self,
+        _044_AddProMessageFlag.self
+    ]
 
     public static func configure(using dependencies: Dependencies) {
         // Configure the job executors

diff --git a/...grations/_001_InitialSetupMigration.swift → ...ions/_001_SUK_InitialSetupMigration.swift b/...grations/_001_InitialSetupMigration.swift → ...ions/_001_SUK_InitialSetupMigration.swift
@@ -4,10 +4,10 @@
 
 import Foundation
 import GRDB
+import SessionUtilitiesKit
 
-enum _001_InitialSetupMigration: Migration {
-    static let target: TargetMigrations.Identifier = .utilitiesKit
-    static let identifier: String = "initialSetup"
+enum _001_SUK_InitialSetupMigration: Migration {
+    static let identifier: String = "utilitiesKit.initialSetup"
     static let minExpectedRunDuration: TimeInterval = 0.1
     static let createdTables: [(TableRecord & FetchableRecord).Type] = [
         Identity.self, Job.self, JobDependencies.self

diff --git a/...e/Migrations/_002_SetupStandardJobs.swift → ...grations/_002_SUK_SetupStandardJobs.swift b/...e/Migrations/_002_SetupStandardJobs.swift → ...grations/_002_SUK_SetupStandardJobs.swift
@@ -2,12 +2,12 @@
 
 import Foundation
 import GRDB
+import SessionUtilitiesKit
 
 /// This migration sets up the standard jobs, since we want these jobs to run before any "once-off" jobs we do this migration
 /// before running the `YDBToGRDBMigration`
-enum _002_SetupStandardJobs: Migration {
-    static let target: TargetMigrations.Identifier = .utilitiesKit
-    static let identifier: String = "SetupStandardJobs"
+enum _002_SUK_SetupStandardJobs: Migration {
+    static let identifier: String = "utilitiesKit.SetupStandardJobs"
     static let minExpectedRunDuration: TimeInterval = 0.1
     static let createdTables: [(TableRecord & FetchableRecord).Type] = []
 

diff --git a/.../Migrations/_003_YDBToGRDBMigration.swift → ...rations/_003_SUK_YDBToGRDBMigration.swift b/.../Migrations/_003_YDBToGRDBMigration.swift → ...rations/_003_SUK_YDBToGRDBMigration.swift
@@ -4,9 +4,8 @@ import Foundation
 import GRDB
 import SessionUtilitiesKit
 
-enum _003_YDBToGRDBMigration: Migration {
-    static let target: TargetMigrations.Identifier = .networkingKit
-    static let identifier: String = "YDBToGRDBMigration"
+enum _003_SUK_YDBToGRDBMigration: Migration {
+    static let identifier: String = "utilitiesKit.YDBToGRDBMigration"
     static let minExpectedRunDuration: TimeInterval = 0.1
     static let createdTables: [(TableRecord & FetchableRecord).Type] = []
 

diff --git a/...grations/_001_InitialSetupMigration.swift → ...ions/_004_SNK_InitialSetupMigration.swift b/...grations/_001_InitialSetupMigration.swift → ...ions/_004_SNK_InitialSetupMigration.swift
@@ -6,9 +6,8 @@ import Foundation
 import GRDB
 import SessionUtilitiesKit
 
-enum _001_InitialSetupMigration: Migration {
-    static let target: TargetMigrations.Identifier = .networkingKit
-    static let identifier: String = "initialSetup"
+enum _004_SNK_InitialSetupMigration: Migration {
+    static let identifier: String = "snodeKit.initialSetup"
     static let minExpectedRunDuration: TimeInterval = 0.1
     static let createdTables: [(TableRecord & FetchableRecord).Type] = []
 

diff --git a/...e/Migrations/_002_SetupStandardJobs.swift → ...grations/_005_SNK_SetupStandardJobs.swift b/...e/Migrations/_002_SetupStandardJobs.swift → ...grations/_005_SNK_SetupStandardJobs.swift
@@ -6,9 +6,8 @@ import SessionUtilitiesKit
 
 /// This migration sets up the standard jobs, since we want these jobs to run before any "once-off" jobs we do this migration
 /// before running the `YDBToGRDBMigration`
-enum _002_SetupStandardJobs: Migration {
-    static let target: TargetMigrations.Identifier = .networkingKit
-    static let identifier: String = "SetupStandardJobs"
+enum _005_SNK_SetupStandardJobs: Migration {
+    static let identifier: String = "snodeKit.SetupStandardJobs"
     static let minExpectedRunDuration: TimeInterval = 0.1
     static let createdTables: [(TableRecord & FetchableRecord).Type] = []
 

diff --git a/...grations/_001_InitialSetupMigration.swift → ...ions/_006_SMK_InitialSetupMigration.swift b/...grations/_001_InitialSetupMigration.swift → ...ions/_006_SMK_InitialSetupMigration.swift
@@ -6,9 +6,8 @@ import Foundation
 import GRDB
 import SessionUtilitiesKit
 
-enum _001_InitialSetupMigration: Migration {
-    static let target: TargetMigrations.Identifier = .messagingKit
-    static let identifier: String = "initialSetup"
+enum _006_SMK_InitialSetupMigration: Migration {
+    static let identifier: String = "messagingKit.initialSetup"
     static let minExpectedRunDuration: TimeInterval = 0.1
     static let createdTables: [(TableRecord & FetchableRecord).Type] = [
         Contact.self, Profile.self, SessionThread.self, DisappearingMessagesConfiguration.self,
@@ -59,7 +58,7 @@ enum _001_InitialSetupMigration: Migration {
         /// Create a full-text search table synchronized with the Profile table
         try db.create(virtualTable: "profile_fts", using: FTS5()) { t in
             t.synchronize(withTable: "profile")
-            t.tokenizer = _001_InitialSetupMigration.fullTextSearchTokenizer
+            t.tokenizer = _006_SMK_InitialSetupMigration.fullTextSearchTokenizer
 
             t.column("nickname")
             t.column("name")
@@ -106,7 +105,7 @@ enum _001_InitialSetupMigration: Migration {
         /// Create a full-text search table synchronized with the ClosedGroup table
         try db.create(virtualTable: "closedGroup_fts", using: FTS5()) { t in
             t.synchronize(withTable: "closedGroup")
-            t.tokenizer = _001_InitialSetupMigration.fullTextSearchTokenizer
+            t.tokenizer = _006_SMK_InitialSetupMigration.fullTextSearchTokenizer
 
             t.column("name")
         }
@@ -157,7 +156,7 @@ enum _001_InitialSetupMigration: Migration {
         /// Create a full-text search table synchronized with the OpenGroup table
         try db.create(virtualTable: "openGroup_fts", using: FTS5()) { t in
             t.synchronize(withTable: "openGroup")
-            t.tokenizer = _001_InitialSetupMigration.fullTextSearchTokenizer
+            t.tokenizer = _006_SMK_InitialSetupMigration.fullTextSearchTokenizer
 
             t.column("name")
         }
@@ -268,7 +267,7 @@ enum _001_InitialSetupMigration: Migration {
         /// Create a full-text search table synchronized with the Interaction table
         try db.create(virtualTable: "interaction_fts", using: FTS5()) { t in
             t.synchronize(withTable: "interaction")
-            t.tokenizer = _001_InitialSetupMigration.fullTextSearchTokenizer
+            t.tokenizer = _006_SMK_InitialSetupMigration.fullTextSearchTokenizer
 
             t.column("body")
         }

diff --git a/...e/Migrations/_002_SetupStandardJobs.swift → ...grations/_007_SMK_SetupStandardJobs.swift b/...e/Migrations/_002_SetupStandardJobs.swift → ...grations/_007_SMK_SetupStandardJobs.swift
@@ -7,9 +7,8 @@ import SessionNetworkingKit
 
 /// This migration sets up the standard jobs, since we want these jobs to run before any "once-off" jobs we do this migration
 /// before running the `YDBToGRDBMigration`
-enum _002_SetupStandardJobs: Migration {
-    static let target: TargetMigrations.Identifier = .messagingKit
-    static let identifier: String = "SetupStandardJobs"
+enum _007_SMK_SetupStandardJobs: Migration {
+    static let identifier: String = "messagingKit.SetupStandardJobs"
     static let minExpectedRunDuration: TimeInterval = 0.1
     static let createdTables: [(TableRecord & FetchableRecord).Type] = []
 

diff --git a/.../Migrations/_003_YDBToGRDBMigration.swift → ...rations/_008_SNK_YDBToGRDBMigration.swift b/.../Migrations/_003_YDBToGRDBMigration.swift → ...rations/_008_SNK_YDBToGRDBMigration.swift
@@ -2,10 +2,10 @@
 
 import Foundation
 import GRDB
+import SessionUtilitiesKit
 
-enum _003_YDBToGRDBMigration: Migration {
-    static let target: TargetMigrations.Identifier = .utilitiesKit
-    static let identifier: String = "YDBToGRDBMigration"
+enum _008_SNK_YDBToGRDBMigration: Migration {
+    static let identifier: String = "snodeKit.YDBToGRDBMigration"
     static let minExpectedRunDuration: TimeInterval = 0.1
     static let createdTables: [(TableRecord & FetchableRecord).Type] = []
 

diff --git a/.../Migrations/_003_YDBToGRDBMigration.swift → ...rations/_009_SMK_YDBToGRDBMigration.swift b/.../Migrations/_003_YDBToGRDBMigration.swift → ...rations/_009_SMK_YDBToGRDBMigration.swift
@@ -4,9 +4,8 @@ import Foundation
 import GRDB
 import SessionUtilitiesKit
 
-enum _003_YDBToGRDBMigration: Migration {
-    static let target: TargetMigrations.Identifier = .messagingKit
-    static let identifier: String = "YDBToGRDBMigration"
+enum _009_SMK_YDBToGRDBMigration: Migration {
+    static let identifier: String = "messagingKit.YDBToGRDBMigration"
     static let minExpectedRunDuration: TimeInterval = 0.1
     static let createdTables: [(TableRecord & FetchableRecord).Type] = []
 

diff --git a/...4_FlagMessageHashAsDeletedOrInvalid.swift → ...0_FlagMessageHashAsDeletedOrInvalid.swift b/...4_FlagMessageHashAsDeletedOrInvalid.swift → ...0_FlagMessageHashAsDeletedOrInvalid.swift
@@ -7,9 +7,8 @@ import SessionUtilitiesKit
 /// This migration adds a flag to the `SnodeReceivedMessageInfo` so that when deleting interactions we can
 /// ignore their hashes when subsequently trying to fetch new messages (which results in the storage server returning
 /// messages from the beginning of time)
-enum _004_FlagMessageHashAsDeletedOrInvalid: Migration {
-    static let target: TargetMigrations.Identifier = .networkingKit
-    static let identifier: String = "FlagMessageHashAsDeletedOrInvalid"
+enum _010_FlagMessageHashAsDeletedOrInvalid: Migration {
+    static let identifier: String = "snodeKit.FlagMessageHashAsDeletedOrInvalid"
     static let minExpectedRunDuration: TimeInterval = 0.2
     static let createdTables: [(TableRecord & FetchableRecord).Type] = []
 

diff --git a/...ase/Migrations/_004_RemoveLegacyYDB.swift → ...ase/Migrations/_011_RemoveLegacyYDB.swift b/...ase/Migrations/_004_RemoveLegacyYDB.swift → ...ase/Migrations/_011_RemoveLegacyYDB.swift
@@ -6,9 +6,8 @@ import SessionUtilitiesKit
 import SessionNetworkingKit
 
 /// This migration used to remove the legacy YapDatabase files (the old logic has been removed and is no longer supported so it now does nothing)
-enum _004_RemoveLegacyYDB: Migration {
-    static let target: TargetMigrations.Identifier = .messagingKit
-    static let identifier: String = "RemoveLegacyYDB"
+enum _011_RemoveLegacyYDB: Migration {
+    static let identifier: String = "messagingKit.RemoveLegacyYDB"
     static let minExpectedRunDuration: TimeInterval = 0.1
     static let createdTables: [(TableRecord & FetchableRecord).Type] = []
 

diff --git a/...base/Migrations/_004_AddJobPriority.swift → ...base/Migrations/_012_AddJobPriority.swift b/...base/Migrations/_004_AddJobPriority.swift → ...base/Migrations/_012_AddJobPriority.swift
@@ -2,10 +2,10 @@
 
 import Foundation
 import GRDB
+import SessionUtilitiesKit
 
-enum _004_AddJobPriority: Migration {
-    static let target: TargetMigrations.Identifier = .utilitiesKit
-    static let identifier: String = "AddJobPriority"
+enum _012_AddJobPriority: Migration {
+    static let identifier: String = "utilitiesKit.AddJobPriority"
     static let minExpectedRunDuration: TimeInterval = 0.1
     static let createdTables: [(TableRecord & FetchableRecord).Type] = []
 

diff --git a/...ons/_005_FixDeletedMessageReadState.swift → ...ons/_013_FixDeletedMessageReadState.swift b/...ons/_005_FixDeletedMessageReadState.swift → ...ons/_013_FixDeletedMessageReadState.swift
@@ -5,9 +5,8 @@ import GRDB
 import SessionUtilitiesKit
 
 /// This migration fixes a bug where certain message variants could incorrectly be counted as unread messages
-enum _005_FixDeletedMessageReadState: Migration {
-    static let target: TargetMigrations.Identifier = .messagingKit
-    static let identifier: String = "FixDeletedMessageReadState"
+enum _013_FixDeletedMessageReadState: Migration {
+    static let identifier: String = "messagingKit.FixDeletedMessageReadState"
     static let minExpectedRunDuration: TimeInterval = 0.01
     static let createdTables: [(TableRecord & FetchableRecord).Type] = []
 

diff --git a/...tions/_006_FixHiddenModAdminSupport.swift → ...tions/_014_FixHiddenModAdminSupport.swift b/...tions/_006_FixHiddenModAdminSupport.swift → ...tions/_014_FixHiddenModAdminSupport.swift
@@ -6,9 +6,8 @@ import SessionUtilitiesKit
 
 /// This migration fixes an issue where hidden mods/admins weren't getting recognised as mods/admins, it reset's the `info_updates`
 /// for open groups so they will fully re-fetch their mod/admin lists
-enum _006_FixHiddenModAdminSupport: Migration {
-    static let target: TargetMigrations.Identifier = .messagingKit
-    static let identifier: String = "FixHiddenModAdminSupport"
+enum _014_FixHiddenModAdminSupport: Migration {
+    static let identifier: String = "messagingKit.FixHiddenModAdminSupport"
     static let minExpectedRunDuration: TimeInterval = 0.01
     static let createdTables: [(TableRecord & FetchableRecord).Type] = []
 

diff --git a/...s/_007_HomeQueryOptimisationIndexes.swift → ...s/_015_HomeQueryOptimisationIndexes.swift b/...s/_007_HomeQueryOptimisationIndexes.swift → ...s/_015_HomeQueryOptimisationIndexes.swift
@@ -7,9 +7,8 @@ import GRDB
 import SessionUtilitiesKit
 
 /// This migration adds an index to the interaction table in order to improve the performance of retrieving the number of unread interactions
-enum _007_HomeQueryOptimisationIndexes: Migration {
-    static let target: TargetMigrations.Identifier = .messagingKit
-    static let identifier: String = "HomeQueryOptimisationIndexes"
+enum _015_HomeQueryOptimisationIndexes: Migration {
+    static let identifier: String = "messagingKit.HomeQueryOptimisationIndexes"
     static let minExpectedRunDuration: TimeInterval = 0.01
     static let createdTables: [(TableRecord & FetchableRecord).Type] = []
 

diff --git a/...se/Migrations/_001_ThemePreferences.swift → ...se/Migrations/_016_ThemePreferences.swift b/...se/Migrations/_001_ThemePreferences.swift → ...se/Migrations/_016_ThemePreferences.swift
@@ -13,9 +13,8 @@ import SessionUtilitiesKit
 /// **Note:** This migration used to live within `SessionUIKit` but we wanted to isolate it and remove dependencies from it so we
 /// needed to extract this migration into the `Session` and `SessionShareExtension` targets (since both need theming they both
 /// need to provide this migration as an option during setup)
-enum _001_ThemePreferences: Migration {
-    static let target: TargetMigrations.Identifier = ._deprecatedUIKit
-    static let identifier: String = "ThemePreferences"
+enum _016_ThemePreferences: Migration {
+    static let identifier: String = "uiKit.ThemePreferences"
     static let minExpectedRunDuration: TimeInterval = 0.1
     static let createdTables: [(TableRecord & FetchableRecord).Type] = []
 
@@ -86,25 +85,3 @@ private extension Theme.PrimaryColor {
         }
     }
 }
-
-enum DeprecatedUIKitMigrationTarget: MigratableTarget {
-    public static func migrations() -> TargetMigrations {
-        return TargetMigrations(
-            identifier: ._deprecatedUIKit,
-            migrations: [
-                // Want to ensure the initial DB stuff has been completed before doing any
-                // SNUIKit migrations
-                [], // Initial DB Creation
-                [], // YDB to GRDB Migration
-                [], // Legacy DB removal
-                [
-                    _001_ThemePreferences.self
-                ],  // Add job priorities
-                [], // Fix thread FTS
-                [],
-                [], // Renamed `Setting` to `KeyValueStore`
-                []
-            ]
-        )
-    }
-}