aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_adapter.rb')
-rwxr-xr-xactiverecord/lib/active_record/connection_adapters/abstract_adapter.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 5eedf448a4..1ad54e7584 100755
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -193,15 +193,17 @@ module ActiveRecord
def log_info(sql, name, ms)
if @logger && @logger.debug?
- name = '%s (%.1fms)' % [name || 'SQL', ms]
+ name = '%s (%.1fms)' % [name, ms]
@logger.debug(format_log_entry(name, sql.squeeze(' ')))
end
end
protected
def log(sql, name)
+ name ||= "SQL"
result = nil
- ActiveSupport::Notifications.instrument("active_record.sql", :sql => sql, :name => name) do
+ ActiveSupport::Notifications.instrument("active_record.sql",
+ :sql => sql, :name => name, :connection => self) do
@runtime += Benchmark.ms { result = yield }
end
result