Changeset 6179

Timestamp:

02/20/07 23:42:04 (2 years ago)

Author:

xal

Message:

You can now use cache in instance hierachies. This allows ActiveRecord::Base.cache { } usage to cache everything

Files:

• trunk/activerecord/lib/active_record/query_cache.rb (modified) (1 diff)
• trunk/activerecord/test/query_cache_test.rb (modified) (3 diffs)

trunk/activerecord/lib/active_record/query_cache.rb

@@ -64 +64 @@
-        (Thread.current[:query_cache] ||= {})
-      end
+      
+      def query_cache
+        if query_caches[self]
+          query_caches[self]
+        elsif superclass.respond_to?(:query_cache)
+          superclass.query_cache
+        end
+      end
+      
+      def query_cache=(cache)
+        query_caches[self] = cache
+      end
-            
-      def cache        
-query_caches[self] = QueryCache.new(connection
+self.query_cache = QueryCache.new(connection_without_query_cache
-        yield
-      ensure 
-query_caches[self]
+self.query_cache
-      end        
-      
-      def connection
-s[self]
+
-      end
-    end

trunk/activerecord/test/query_cache_test.rb

@@ -4 +4 @@
-require 'fixtures/task'
-
-
-class QueryCacheTest < Test::Unit::TestCase
-  fixtures :tasks
-
-  
-  def test_find_queries
@@ -24 +22 @@
-    end
-  end
+  
+  def test_query_cache_returned        
+    assert_not_equal ActiveRecord::QueryCache, Task.connection.class
+    Task.cache do 
+      assert_equal ActiveRecord::QueryCache, Task.connection.class      
+    end    
+  end
+  
-
-  def test_cache_is_scoped_on_actual_class_only
@@ -30 +36 @@
-    end
-  end
+  
+  
+  def test_cache_is_scoped_on_all_descending_classes
+    ActiveRecord::Base.cache do
+      assert_queries(1) {  Task.find(1); Task.find(1) }    
+    end
+  end
+  
+  
-end
+
-
-uses_mocha('QueryCacheExpiryTest') do