diff options
author | José Valim <jose.valim@gmail.com> | 2010-04-29 13:24:24 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-04-29 13:24:35 +0200 |
commit | 3dfcb56e4585c8530be6dcc5129ae0c4d16c0dea (patch) | |
tree | 8cf54972e70ddad215eb786c9c76dc090b5f4556 /activerecord/lib | |
parent | e9a9ef094e84abfe6a0167e9255abcf5b63412d9 (diff) | |
download | rails-3dfcb56e4585c8530be6dcc5129ae0c4d16c0dea.tar.gz rails-3dfcb56e4585c8530be6dcc5129ae0c4d16c0dea.tar.bz2 rails-3dfcb56e4585c8530be6dcc5129ae0c4d16c0dea.zip |
ActiveRecord middlewares should be inserted before AD::Cascade [#4493 state:resolved].
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/railtie.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index f3d21d4969..898df0a67a 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -61,13 +61,8 @@ module ActiveRecord # Setup database middleware after initializers have run initializer "active_record.initialize_database_middleware", :after => "action_controller.set_configs" do |app| middleware = app.config.middleware - if middleware.include?("ActiveRecord::SessionStore") - middleware.insert_before "ActiveRecord::SessionStore", ActiveRecord::ConnectionAdapters::ConnectionManagement - middleware.insert_before "ActiveRecord::SessionStore", ActiveRecord::QueryCache - else - middleware.use ActiveRecord::ConnectionAdapters::ConnectionManagement - middleware.use ActiveRecord::QueryCache - end + middleware.insert_after "::ActionDispatch::Callbacks", ActiveRecord::QueryCache + middleware.insert_after "::ActionDispatch::Callbacks", ActiveRecord::ConnectionAdapters::ConnectionManagement end initializer "active_record.set_dispatch_hooks", :before => :set_clear_dependencies_hook do |app| |