r1611@asus: jeremy | 2005-07-03 04:21:52 -0700

 No longer pass superfluous connection to AbstractAdapter#log.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1629 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 11 insertions, 10 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 2bb68d1810..459b05413c 100755
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -392,17 +392,18 @@ module ActiveRecord
 
 
       protected
-        def log(sql, name, connection = nil)
-          connection ||= @connection
+        def log(sql, name)
           begin
-            if !@logger || @logger.level > Logger::INFO
-              yield connection
-            elsif block_given?
-              result = nil
-              bm = measure { result = yield connection }
-              @runtime += bm.real
-              log_info(sql, name, bm.real)
-              result
+            if block_given?
+              if @logger and @logger.level <= Logger::INFO
+                result = nil
+                bm = measure { result = yield }
+                @runtime += bm.real
+                log_info(sql, name, bm.real)
+                result
+              else
+                yield
+              end
             else
               log_info(sql, name, 0)
               nil