diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2017-12-14 08:10:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-14 08:10:19 -0500 |
| commit | 4bd28efc189cf58891ece9d57d44994039054ca0 (patch) | |
| tree | 6582d7a000426b8471e30cb5b3b6a3692a7274dd /railties/lib | |
| parent | 245c1dafa8bab409fbcd780a996c619240df7143 (diff) | |
| parent | 3876defd7c951335129fa92c573c7b8fce085aac (diff) | |
| download | rails-4bd28efc189cf58891ece9d57d44994039054ca0.tar.gz rails-4bd28efc189cf58891ece9d57d44994039054ca0.tar.bz2 rails-4bd28efc189cf58891ece9d57d44994039054ca0.zip | |
Merge pull request #26815 from olivierlacan/log-query-source
Log the original call site for an ActiveRecord query
Diffstat (limited to 'railties/lib')
2 files changed, 6 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt index b383228dc0..961e167d24 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt @@ -46,6 +46,9 @@ Rails.application.configure do # Raise an error on page load if there are pending migrations. config.active_record.migration_error = :page_load + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + <%- end -%> <%- unless options.skip_sprockets? -%> # Debug mode disables concatenation and preprocessing of assets. 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 25dcddb27a..f630d9985a 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,3 +25,6 @@ # 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? |