kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Don't allow AR::Tasks::DatabaseTasks.migrate to mutate Migration.verbose value

Browse source 
This fixes random test failure in migrator_test.rb
This commit is contained in:
Akira Matsuda 2014-08-30 02:28:44 +09:00
parent 4606e7527b
commit f8d9a51949
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activerecord/lib/active_record/tasks/database_tasks.rb
View file

@ -131,10 +131,12 @@ module ActiveRecord
verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
scope = ENV['SCOPE']
Migration.verbose = verbose
verbose_was = Migration.verbose
Migrator.migrate(Migrator.migrations_paths, version) do |migration|
scope.blank? || scope == migration.scope
end
ensure
Migration.verbose = verbose_was
end
def charset_current(environment = env)