Merge branch 'master' of git://github.com/rails/rails

1 files changed, 13 insertions, 4 deletions

diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 6735bc521b..859c3d1947 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -8,6 +8,7 @@ require 'mocha'
 
 require 'active_record'
 require 'active_support/dependencies'
+require 'active_support/logger'
 
 require 'support/config'
 require 'support/connection'
@@ -68,14 +69,19 @@ module ActiveRecord
     cattr_accessor :log
     self.log = []
 
+    attr_reader :ignore
+
+    def initialize(ignore = self.class.ignored_sql)
+      @ignore   = ignore
+    end
+
     def call(name, start, finish, message_id, values)
       sql = values[:sql]
 
       # FIXME: this seems bad. we should probably have a better way to indicate
       # the query was cached
-      unless 'CACHE' == values[:name]
-        self.class.log << sql unless self.class.ignored_sql.any? { |r| sql =~ r }
-      end
+      return if 'CACHE' == values[:name] || ignore.any? { |x| x =~ sql }
+      self.class.log << sql
     end
   end
 
@@ -85,7 +91,10 @@ end
 unless ENV['FIXTURE_DEBUG']
   module ActiveRecord::TestFixtures::ClassMethods
     def try_to_load_dependency_with_silence(*args)
-      ActiveRecord::Base.logger.silence { try_to_load_dependency_without_silence(*args)}
+      old = ActiveRecord::Base.logger.level
+      ActiveRecord::Base.logger.level = ActiveSupport::Logger::ERROR
+      try_to_load_dependency_without_silence(*args)
+      ActiveRecord::Base.logger.level = old
     end
 
     alias_method_chain :try_to_load_dependency, :silence