Changeset 6189

Timestamp:

02/21/07 18:08:39 (2 years ago)

Author:

xal

Message:

Enable active record cache automatically for all actions

Files:

• trunk/actionpack/lib/action_controller/caching.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb (modified) (2 diffs)
• trunk/activerecord/lib/active_record/query_cache.rb (modified) (2 diffs)

trunk/actionpack/lib/action_controller/caching.rb

@@ -11 +11 @@
-  module Caching
-    def self.included(base) #:nodoc:
-
+
+
-
-      base.class_eval do
@@ -613 +614 @@
-      end
-    end
+    
+    if defined?(ActiveRecord)     
+      module SqlCache
+        def self.included(base) #:nodoc:
+          base.alias_method_chain :perform_action, :caching
+        end
+        
+        def perform_action_with_caching
+          ActiveRecord::Base.cache do
+            perform_action_without_caching
+          end
+        end
+      end
+    end
+    
-  end
-end

trunk/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -102 +102 @@
-        @connection
-      end
+      
+      def log_info(sql, name, runtime)
+        return unless @logger or !@logger.debug?
+
+        @logger.debug(
+          format_log_entry(
+            "#{name.nil? ? "SQL" : name} (#{sprintf("%f", runtime)})",
+            sql.gsub(/ +/, " ")
+          )
+        )
+      end      
-
-      protected
@@ -129 +140 @@
-        end
-
-        def log_info(sql, name, runtime)
-          return unless @logger
-
-          @logger.debug(
-            format_log_entry(
-              "#{name.nil? ? "SQL" : name} (#{sprintf("%f", runtime)})",
-              sql.gsub(/ +/, " ")
-            )
-          )
-        end
-
-        def format_log_entry(message, dump = nil)
-          if ActiveRecord::Base.colorize_logging

trunk/activerecord/lib/active_record/query_cache.rb

@@ -11 +11 @@
-
-    def select_all(sql, name = nil)
-(@query_cache[sql] ||= @connection.select_all(sql, name)).dup
+cache(sql) { @connection.select_all(sql, name) }
-    end
-
-    def select_one(sql, name = nil)
-@query_cache[sql] ||= @connection.select_one(sql, name)
+cache(sql) { @connection.select_one(sql, name) }
-    end
-    
-    def select_values(sql, name = nil)
-(@query_cache[sql] ||= @connection.select_values(sql, name)).dup
+cache(sql) { @connection.select_values(sql, name) }
-    end
-
-    def select_value(sql, name = nil)
-@query_cache[sql] ||= @connection.select_value(sql, name)
+cache(sql) { @connection.select_value(sql, name) }
-    end
-    
@@ -51 +51 @@
-    
-    private
+    
+      def cache(sql)
+        result = if @query_cache.has_key?(sql)
+          log_info(sql, "CACHE", 0.0)
+          @query_cache[sql]
+        else
+          @query_cache[sql] = yield
+        end
+        
+        result ? result.dup : nil
+      end
+    
-      def method_missing(method, *arguments, &proc)
-        @connection.send(method, *arguments, &proc)