Permalink
Browse files

Explicitly require active_record/query_cache before using it.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7419 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent f1b12b6 commit 2894887925a3613f1ea9f81bd72ec1f51c3e06da @jeremy jeremy committed Sep 8, 2007
View
@@ -1,5 +1,7 @@
*SVN*
+* Explicitly require active_record/query_cache before using it. [Jeremy Kemper]
+
* Fix layout overriding response status. #9476 [lotswholetime]
* Add fieldset_tag for generating fieldsets, closes #9477. [djanowski]
@@ -12,7 +12,10 @@ module ActionController #:nodoc:
module Caching
def self.included(base) #:nodoc:
base.send(:include, Pages, Actions, Fragments)
- base.send(:include, Sweeping, SqlCache) if defined?(ActiveRecord)
+ if defined?(ActiveRecord)
+ require 'active_record/query_cache'
+ base.send(:include, Sweeping, SqlCache)
+ end
base.class_eval do
@@perform_caching = true
@@ -656,20 +659,19 @@ def method_missing(method, *arguments)
end
end
end
-
- if defined?(ActiveRecord)
- module SqlCache
- def self.included(base) #:nodoc:
+
+ module SqlCache
+ def self.included(base) #:nodoc:
+ if defined?(ActiveRecord) && ActiveRecord::Base.respond_to?(:cache)
base.alias_method_chain :perform_action, :caching
end
-
- def perform_action_with_caching
- ActiveRecord::Base.cache do
- perform_action_without_caching
- end
+ end
+
+ def perform_action_with_caching
+ ActiveRecord::Base.cache do
+ perform_action_without_caching
end
end
end
-
end
end
View
@@ -1,5 +1,7 @@
*SVN*
+* Explicitly require active_record/query_cache before using it. [Jeremy Kemper]
+
* Fix bug where unserializing an attribute attempts to modify a frozen @attributes hash for a deleted record. [Rick, marclove]
* Performance: absorb instantiate and initialize_with_callbacks into the Base methods. [Jeremy Kemper]
@@ -75,5 +75,4 @@
require 'active_record/connection_adapters/abstract_adapter'
-require 'active_record/query_cache'
require 'active_record/schema_dumper'
@@ -62,7 +62,7 @@ def cache(sql)
case result
when Array
result.collect { |row| row.dup }
- when Numeric, NilClass, FalseClass
+ when Fixnum, NilClass, FalseClass
result
else
result.dup
@@ -4,6 +4,8 @@
require 'fixtures/task'
require 'fixtures/course'
+require 'active_record/query_cache'
+
class QueryCacheTest < Test::Unit::TestCase
fixtures :tasks
@@ -117,4 +119,4 @@ def test_new_save
end
end
-end
+end

0 comments on commit 2894887

Please sign in to comment.