Changeset 7419

Timestamp:

09/08/07 04:31:26 (1 year ago)

Author:

bitsweat

Message:

Explicitly require active_record/query_cache before using it.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/caching.rb (modified) (2 diffs)
• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/query_cache.rb (modified) (1 diff)
• trunk/activerecord/test/query_cache_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Explicitly require active_record/query_cache before using it.  [Jeremy Kemper]
-
-* Fix layout overriding response status.  #9476 [lotswholetime]

trunk/actionpack/lib/action_controller/caching.rb

@@ -13 +13 @@
-    def self.included(base) #:nodoc:
-      base.send(:include, Pages, Actions, Fragments)
-
+
+
+
+
-
-      base.class_eval do
@@ -657 +660 @@
-      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
-  
-
-    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

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*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]

trunk/activerecord/lib/active_record.rb

@@ -76 +76 @@
-require 'active_record/connection_adapters/abstract_adapter'
-
-require 'active_record/query_cache'
-require 'active_record/schema_dumper'

trunk/activerecord/lib/active_record/query_cache.rb

@@ -63 +63 @@
-        when Array
-          result.collect { |row| row.dup }
-Numeric
+Fixnum
-          result
-        else

trunk/activerecord/test/query_cache_test.rb

@@ -4 +4 @@
-require 'fixtures/task'
-require 'fixtures/course'
+
+require 'active_record/query_cache'
-
-class QueryCacheTest < Test::Unit::TestCase