Remove code duplication

1 files changed, 9 insertions, 8 deletions

diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 2d2ca4c8e8..6c020e1d57 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -871,10 +871,7 @@ module ActiveRecord
       raise UnknownMigrationVersionError.new(@target_version) if migration.nil?
       unless (up? && migrated.include?(migration.version.to_i)) || (down? && !migrated.include?(migration.version.to_i))
         begin
-          ddl_transaction(migration) do
-            migration.migrate(@direction)
-            record_version_state_after_migrating(migration.version)
-          end
+          execute_migration_in_transaction(migration, @direction)
         rescue => e
           canceled_msg = use_transaction?(migration) ? ", this migration was canceled" : ""
           raise StandardError, "An error has occurred#{canceled_msg}:\n\n#{e}", e.backtrace
@@ -899,10 +896,7 @@ module ActiveRecord
         Base.logger.info "Migrating to #{migration.name} (#{migration.version})" if Base.logger
 
         begin
-          ddl_transaction(migration) do
-            migration.migrate(@direction)
-            record_version_state_after_migrating(migration.version)
-          end
+          execute_migration_in_transaction(migration, @direction)
         rescue => e
           canceled_msg = use_transaction?(migration) ? "this and " : ""
           raise StandardError, "An error has occurred, #{canceled_msg}all later migrations canceled:\n\n#{e}", e.backtrace
@@ -939,6 +933,13 @@ module ActiveRecord
       migrated.include?(migration.version.to_i)
     end
 
+    def execute_migration_in_transaction(migration, direction)
+      ddl_transaction(migration) do
+        migration.migrate(direction)
+        record_version_state_after_migrating(migration.version)
+      end
+    end
+
     def target
       migrations.detect { |m| m.version == @target_version }
     end