1 files changed, 14 insertions, 1 deletions
diff --git a/lib/gitlab/database/background_migration/batched_migration.rb b/lib/gitlab/database/background_migration/batched_migration.rb
index 92cafd1d00e..61a660ad14c 100644
--- a/lib/gitlab/database/background_migration/batched_migration.rb
+++ b/lib/gitlab/database/background_migration/batched_migration.rb
@@ -94,8 +94,21 @@ module Gitlab
         end
 
         def self.active_migration(connection:)
+          active_migrations_distinct_on_table(connection: connection, limit: 1).first
+        end
+
+        def self.find_executable(id, connection:)
           for_gitlab_schema(Gitlab::Database.gitlab_schemas_for_connection(connection))
-            .executable.queue_order.first
+            .executable.find_by_id(id)
+        end
+
+        def self.active_migrations_distinct_on_table(connection:, limit:)
+          distinct_on_table = select('DISTINCT ON (table_name) id')
+            .for_gitlab_schema(Gitlab::Database.gitlab_schemas_for_connection(connection))
+            .executable
+            .order(table_name: :asc, id: :asc)
+
+          where(id: distinct_on_table).queue_order.limit(limit)
         end
 
         def self.successful_rows_counts(migrations)