aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorPaul Rosania <paul.rosania@gmail.com>2010-01-27 01:08:50 -0500
committerJeremy Kemper <jeremy@bitsweat.net>2010-01-29 19:25:58 -0800
commit766e857bea9bd29f27be1ccd888eec066f2e3f04 (patch)
tree8fb8934ba767997fd944c70379d01fcdbb6d6342 /activerecord
parenta06c47a52b90a5d812e64309488ad5926dc583ca (diff)
downloadrails-766e857bea9bd29f27be1ccd888eec066f2e3f04.tar.gz
rails-766e857bea9bd29f27be1ccd888eec066f2e3f04.tar.bz2
rails-766e857bea9bd29f27be1ccd888eec066f2e3f04.zip
tsort-based dependency resolution for initializers
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/railtie.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index dc80ac4b30..30da494d57 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -50,7 +50,7 @@ module ActiveRecord
end
# Setup database middleware after initializers have run
- initializer "active_record.initialize_database_middleware" do |app|
+ 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