Skip to content

Commit 7ee8d7e

Browse files
authored
Merge pull request rails#39024 from ka8725/simplify-code-in-migration-class
Get rid of redundant direction argument in execute_migration_in_transaction
2 parents 712f361 + d28fc76 commit 7ee8d7e

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

activerecord/lib/active_record/migration.rb

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ def load_migrated
12591259
def run_without_lock
12601260
migration = migrations.detect { |m| m.version == @target_version }
12611261
raise UnknownMigrationVersionError.new(@target_version) if migration.nil?
1262-
result = execute_migration_in_transaction(migration, @direction)
1262+
result = execute_migration_in_transaction(migration)
12631263

12641264
record_environment
12651265
result
@@ -1271,10 +1271,7 @@ def migrate_without_lock
12711271
raise UnknownMigrationVersionError.new(@target_version)
12721272
end
12731273

1274-
result = runnable.each do |migration|
1275-
execute_migration_in_transaction(migration, @direction)
1276-
end
1277-
1274+
result = runnable.each(&method(:execute_migration_in_transaction))
12781275
record_environment
12791276
result
12801277
end
@@ -1294,14 +1291,14 @@ def invalid_target?
12941291
@target_version && @target_version != 0 && !target
12951292
end
12961293

1297-
def execute_migration_in_transaction(migration, direction)
1294+
def execute_migration_in_transaction(migration)
12981295
return if down? && !migrated.include?(migration.version.to_i)
12991296
return if up? && migrated.include?(migration.version.to_i)
13001297

13011298
Base.logger.info "Migrating to #{migration.name} (#{migration.version})" if Base.logger
13021299

13031300
ddl_transaction(migration) do
1304-
migration.migrate(direction)
1301+
migration.migrate(@direction)
13051302
record_version_state_after_migrating(migration.version)
13061303
end
13071304
rescue => e

0 commit comments

Comments
 (0)