diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-28 13:20:07 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-28 13:21:56 -0300 |
commit | e06b4fab8e77f36e534804780eb80eae46587a4a (patch) | |
tree | 86d88341aa24c7d07ba709e3050f3c381068859a | |
parent | 75d0a81ffe48030bb8d6fa79f70f5b368f748b7c (diff) | |
download | rails-e06b4fab8e77f36e534804780eb80eae46587a4a.tar.gz rails-e06b4fab8e77f36e534804780eb80eae46587a4a.tar.bz2 rails-e06b4fab8e77f36e534804780eb80eae46587a4a.zip |
Removing explain support warning from the Railtie
This is causing a regression since the Active Record Railtie is trying to
connect to the development database in the application boot.
See https://github.com/rails/rails/pull/6197#issuecomment-15199273
-rw-r--r-- | activerecord/CHANGELOG.md | 7 | ||||
-rw-r--r-- | activerecord/lib/active_record/railtie.rb | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 9e6d44c8f0..f63da3cef8 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,5 +1,12 @@ ## unreleased ## +* Removed warning when `auto_explain_threshold_in_seconds` is set and the + connection adapter doesn't support explain. + This is causing a regression since the Active Record Railtie is trying to + connect to the development database in the application boot. + + *Rafael Mendonça França* + * Do not reset `inheritance_column` when it's set explicitly. Backport of #5327. diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 055d27d85c..13b7c6e214 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -83,13 +83,6 @@ module ActiveRecord end end - initializer "active_record.validate_explain_support" do |app| - if app.config.active_record[:auto_explain_threshold_in_seconds] && - !ActiveRecord::Base.connection.supports_explain? - warn "auto_explain_threshold_in_seconds is set but will be ignored because your adapter does not support this feature. Please unset the configuration to avoid this warning." - end - end - # Expose database runtime to controller for logging. initializer "active_record.log_runtime" do |app| require "active_record/railties/controller_runtime" |