diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-04-26 20:34:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 20:34:38 -0700 |
| commit | 3090017c6310b2eca5de3770e4a84d0cfa0d781e (patch) | |
| tree | 37c13a428ed01b58989c2925745291be5aeb0def /activerecord | |
| parent | f680664d4e2f81216ee73c047b836d49a796234c (diff) | |
| parent | f50e143b77051428a2dbb8822603ffd730230e1f (diff) | |
| download | rails-3090017c6310b2eca5de3770e4a84d0cfa0d781e.tar.gz rails-3090017c6310b2eca5de3770e4a84d0cfa0d781e.tar.bz2 rails-3090017c6310b2eca5de3770e4a84d0cfa0d781e.zip | |
Merge pull request #28881 from bogdanvlviv/verbose-migration
Set consistent typecast ENV["VERBOSE"]
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/tasks/database_tasks.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/tasks/database_tasks_test.rb | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb index 46fa8a70a3..45110a79cd 100644 --- a/activerecord/lib/active_record/tasks/database_tasks.rb +++ b/activerecord/lib/active_record/tasks/database_tasks.rb @@ -164,7 +164,7 @@ module ActiveRecord def migrate raise "Empty VERSION provided" if ENV["VERSION"] && ENV["VERSION"].empty? - verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true + verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] != "false" : true version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil scope = ENV["SCOPE"] verbose_was, Migration.verbose = Migration.verbose, verbose diff --git a/activerecord/test/cases/tasks/database_tasks_test.rb b/activerecord/test/cases/tasks/database_tasks_test.rb index baa41a3a47..b4983624ba 100644 --- a/activerecord/test/cases/tasks/database_tasks_test.rb +++ b/activerecord/test/cases/tasks/database_tasks_test.rb @@ -343,8 +343,23 @@ module ActiveRecord ENV["VERBOSE"] = "false" ENV["VERSION"] = "4" - ActiveRecord::Migrator.expects(:migrate).with("custom/path", 4) + ActiveRecord::Migration.expects(:verbose=).with(false) + ActiveRecord::Migration.expects(:verbose=).with(ActiveRecord::Migration.verbose) + ActiveRecord::Tasks::DatabaseTasks.migrate + + ENV.delete("VERBOSE") + ENV.delete("VERSION") + ActiveRecord::Migrator.expects(:migrate).with("custom/path", nil) + ActiveRecord::Migration.expects(:verbose=).with(true) + ActiveRecord::Migration.expects(:verbose=).with(ActiveRecord::Migration.verbose) + ActiveRecord::Tasks::DatabaseTasks.migrate + + ENV["VERBOSE"] = "yes" + ENV["VERSION"] = "unknown" + ActiveRecord::Migrator.expects(:migrate).with("custom/path", 0) + ActiveRecord::Migration.expects(:verbose=).with(true) + ActiveRecord::Migration.expects(:verbose=).with(ActiveRecord::Migration.verbose) ActiveRecord::Tasks::DatabaseTasks.migrate ensure ENV["VERBOSE"], ENV["VERSION"] = verbose, version |