aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/caching.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-12-22 11:31:18 -0600
committerJoshua Peek <josh@joshpeek.com>2008-12-22 11:31:18 -0600
commitaa002c0e86afdc83693f14667a710107843f0fbd (patch)
tree0ec063c6a18b2f9f523ada8a5d338b68dd562be2 /actionpack/lib/action_controller/caching.rb
parent63aac338332a06d3c9e28dde7954679703ec7620 (diff)
downloadrails-aa002c0e86afdc83693f14667a710107843f0fbd.tar.gz
rails-aa002c0e86afdc83693f14667a710107843f0fbd.tar.bz2
rails-aa002c0e86afdc83693f14667a710107843f0fbd.zip
ActiveRecord::QueryCache middleware
Diffstat (limited to 'actionpack/lib/action_controller/caching.rb')
-rw-r--r--actionpack/lib/action_controller/caching.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index b4d251eb3c..1d14df0052 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -27,7 +27,6 @@ module ActionController #:nodoc:
autoload :Actions, 'action_controller/caching/actions'
autoload :Fragments, 'action_controller/caching/fragments'
autoload :Pages, 'action_controller/caching/pages'
- autoload :SqlCache, 'action_controller/caching/sql_cache'
autoload :Sweeping, 'action_controller/caching/sweeping'
def self.included(base) #:nodoc:
@@ -41,7 +40,7 @@ module ActionController #:nodoc:
end
include Pages, Actions, Fragments
- include Sweeping, SqlCache if defined?(ActiveRecord)
+ include Sweeping if defined?(ActiveRecord)
@@perform_caching = true
cattr_accessor :perform_caching