From 73cc5f270a5c2a2eab76c6c02615fec608822494 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Wed, 21 Jan 2009 12:44:07 -0600
Subject: [PATCH] Setup ActiveRecord QueryCache middleware in the initializer

---
 actionpack/lib/action_controller/middlewares.rb | 8 +++-----
 railties/lib/initializer.rb                     | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/actionpack/lib/action_controller/middlewares.rb b/actionpack/lib/action_controller/middlewares.rb
index 30dbc26f118dc..f9cfc2b18e0fa 100644
--- a/actionpack/lib/action_controller/middlewares.rb
+++ b/actionpack/lib/action_controller/middlewares.rb
@@ -4,8 +4,6 @@
 
 use "ActionController::Failsafe"
 
-use "ActiveRecord::QueryCache", :if => lambda { defined?(ActiveRecord) }
-
 ["ActionController::Session::CookieStore",
  "ActionController::Session::MemCacheStore",
  "ActiveRecord::SessionStore"].each do |store|
@@ -18,6 +16,6 @@
     )
 end
 
-use ActionController::RewindableInput
-use ActionController::ParamsParser
-use Rack::MethodOverride
+use "ActionController::RewindableInput"
+use "ActionController::ParamsParser"
+use "Rack::MethodOverride"
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index dd4d4832333d7..be0487385525c 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -408,6 +408,7 @@ def initialize_database
       if configuration.frameworks.include?(:active_record)
         ActiveRecord::Base.configurations = configuration.database_configuration
         ActiveRecord::Base.establish_connection
+        configuration.middleware.use ActiveRecord::QueryCache
       end
     end