diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 166bc476da..173ea25f11 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added that query benchmarking will only happen if its going to be logged anyway #344 + * Added higher_item and lower_item as public methods for acts_as_list #342 [Tobias Luetke] * Added respondence to *_before_type_cast for all attributes to return their string-state before they were type casted by the column type. diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 1a26057528..66b5962b18 100755 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -349,7 +349,7 @@ module ActiveRecord protected def log(sql, name, connection, &action) begin - if @logger.nil? + if @logger.nil? || @logger.level > Logger::INFO action.call(connection) else result = nil |