diff options
author | Richard Schneeman <richard.schneeman+no-recruiters@gmail.com> | 2017-01-06 20:24:11 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-06 20:24:11 -0600 |
commit | 7b13236818ffb26e94d72885e75966efffd71659 (patch) | |
tree | b76ce1819cf2bedfdd3e10f73d0a23837d708f23 /activerecord/lib | |
parent | 98c6e4e56ca2a8f9f987e12815f7cdf66e5f1485 (diff) | |
parent | 93ee268ef40b052497daf22f124fc1535acabd64 (diff) | |
download | rails-7b13236818ffb26e94d72885e75966efffd71659.tar.gz rails-7b13236818ffb26e94d72885e75966efffd71659.tar.bz2 rails-7b13236818ffb26e94d72885e75966efffd71659.zip |
Merge pull request #27596 from schneems/schneems/migrator-result
Preserve `up` and `down` return type
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/migration.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index ed0c81b639..6e5f5fa2a7 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -1170,9 +1170,10 @@ module ActiveRecord def run_without_lock migration = migrations.detect { |m| m.version == @target_version } raise UnknownMigrationVersionError.new(@target_version) if migration.nil? - execute_migration_in_transaction(migration, @direction) + result = execute_migration_in_transaction(migration, @direction) record_environment + result end # Used for running multiple migrations up to or down to a certain value. @@ -1181,11 +1182,12 @@ module ActiveRecord raise UnknownMigrationVersionError.new(@target_version) end - runnable.each do |migration| + result = runnable.each do |migration| execute_migration_in_transaction(migration, @direction) end record_environment + result end # Stores the current environment in the database. |