diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-04 16:51:35 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-04 16:51:35 -0700 |
commit | 2ae9166d8fef242e3b0d52af0c8c79d86a80268e (patch) | |
tree | be5adbbf0ba449a7d99ed2913a640f2ff4da1d40 /activerecord/lib | |
parent | 98e001641ff0f859349cd60d270fec972edc16de (diff) | |
download | rails-2ae9166d8fef242e3b0d52af0c8c79d86a80268e.tar.gz rails-2ae9166d8fef242e3b0d52af0c8c79d86a80268e.tar.bz2 rails-2ae9166d8fef242e3b0d52af0c8c79d86a80268e.zip |
log the statement name along with the SQL
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 11 | ||||
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 1e1a7323ee..cbe563676b 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -424,13 +424,14 @@ module ActiveRecord protected - def log(sql, name = "SQL", binds = []) + def log(sql, name = "SQL", binds = [], statement_name = nil) @instrumenter.instrument( "sql.active_record", - :sql => sql, - :name => name, - :connection_id => object_id, - :binds => binds) { yield } + :sql => sql, + :name => name, + :connection_id => object_id, + :statement_name => statement_name, + :binds => binds) { yield } rescue => e message = "#{e.class.name}: #{e.message}: #{sql}" @logger.error message if @logger diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 71a70e5c48..0c4d005e63 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -774,7 +774,7 @@ module ActiveRecord def exec_cache(sql, name, binds) stmt_key = prepare_statement(sql) - log(sql, name, binds) do + log(sql, name, binds, stmt_key) do @connection.send_query_prepared(stmt_key, binds.map { |col, val| type_cast(val, col) }) |