Remove verbose_query_logs from new_framework_defaults_5_2.rb

The `app:update` rake task will regenerate `development.rb` so that it
contains this option; that means we're currently adding it to existing
apps in two places, which is unnecessary and confusing.

Also:
 - Remove inaccurate comment about which stack frames are ignored
 - Clarify that the feature uses `caller_locations`, not `caller`
 - Remove unused return value in `extract_callstack`

3 files changed, 3 insertions, 7 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
 
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt
index 8351d849ec..ae665b960a 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt
@@ -25,6 +25,3 @@
 # Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and
 # 'f' after migrating old data.
 # Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
-
-# Highlight code that triggered database queries in logs.
-Rails.application.config.active_record.verbose_query_logs = Rails.env.development?