diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-12-20 13:23:33 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-20 13:23:33 +0900 |
| commit | a8cabf3b2a8057414b291ce492cf6d15107cd652 (patch) | |
| tree | 6c75bdb13cef872da33fd65661ac480e8c0eb12d /activerecord | |
| parent | 08b9d8b3e05ef07a8f16245446cb62ca4f265dbb (diff) | |
| parent | 69d5a7439376401a6c832504aa73686e93da1bd3 (diff) | |
| download | rails-a8cabf3b2a8057414b291ce492cf6d15107cd652.tar.gz rails-a8cabf3b2a8057414b291ce492cf6d15107cd652.tar.bz2 rails-a8cabf3b2a8057414b291ce492cf6d15107cd652.zip | |
Merge pull request #31519 from eugeneius/verbose_query_logs_new_framework_defaults
Remove verbose_query_logs from new_framework_defaults_5_2.rb
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/log_subscriber.rb | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index d5cce3f47c..791de1f2d0 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -15,11 +15,11 @@ Add `verbose_query_logs` configuration option to display the caller of database queries in the log to facilitate N+1 query resolution - and other debugging. Excludes Ruby and Rails callers but not gems. + and other debugging. Enabled in development only for new and upgraded applications. Not recommended for use in the production environment since it relies - on Ruby's `Kernel#caller` which is fairly slow. + on Ruby's `Kernel#caller_locations` which is fairly slow. *Olivier Lacan* diff --git a/activerecord/lib/active_record/log_subscriber.rb b/activerecord/lib/active_record/log_subscriber.rb index ba3419be6c..9234029c22 100644 --- a/activerecord/lib/active_record/log_subscriber.rb +++ b/activerecord/lib/active_record/log_subscriber.rb @@ -121,8 +121,7 @@ module ActiveRecord [ offending_line.path, - offending_line.lineno, - offending_line.label + offending_line.lineno ] end |