diff options
| author | kennyj <kennyj@gmail.com> | 2013-06-04 20:26:00 +0900 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-06-05 17:55:53 +0900 |
| commit | 8ae73f11469e12d5f3f119189a4733a3a25ca785 (patch) | |
| tree | b234081451cea09e5a6907fdb52dcf30f2379c73 /activerecord | |
| parent | 04347540510aff4ce7df2abafcc517de338bd668 (diff) | |
| download | rails-8ae73f11469e12d5f3f119189a4733a3a25ca785.tar.gz rails-8ae73f11469e12d5f3f119189a4733a3a25ca785.tar.bz2 rails-8ae73f11469e12d5f3f119189a4733a3a25ca785.zip | |
Fix #10789. Now at last ::Logger doesn't support #silence method .
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/migration.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/migration_test.rb | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index 511a1585a7..20505d8f08 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -360,9 +360,7 @@ module ActiveRecord end def call(env) - ActiveRecord::Base.logger.silence do - ActiveRecord::Migration.check_pending! - end + ActiveRecord::Migration.check_pending! @app.call(env) end end diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb index 193ffb26e3..e99312c245 100644 --- a/activerecord/test/cases/migration_test.rb +++ b/activerecord/test/cases/migration_test.rb @@ -849,4 +849,13 @@ class CopyMigrationsTest < ActiveRecord::TestCase ensure clear end + + def test_check_pending_with_stdlib_logger + old, ActiveRecord::Base.logger = ActiveRecord::Base.logger, ::Logger.new($stdout) + quietly do + assert_nothing_raised { ActiveRecord::Migration::CheckPending.new(Proc.new {}).call({}) } + end + ensure + ActiveRecord::Base.logger = old + end end |