Merge branch 'master' of github.com:rails/rails

4 files changed, 36 insertions, 11 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
index 1db397f584..093c30aa42 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
@@ -29,6 +29,14 @@ module ActiveRecord
         @query_cache_enabled = old
       end
 
+      def enable_query_cache!
+        @query_cache_enabled = true
+      end
+
+      def disable_query_cache!
+        @query_cache_enabled = false
+      end
+
       # Disable the query cache within the block.
       def uncached
         old, @query_cache_enabled = @query_cache_enabled, false
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index b6f838e49c..98a8dd6453 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -411,11 +411,9 @@ module ActiveRecord
       end
 
       def tables(name = nil)
-        tables = []
-        execute("SHOW TABLES", 'SCHEMA').each do |field|
-          tables << field.first
+        execute("SHOW TABLES", 'SCHEMA').collect do |field|
+          field.first
         end
-        tables
       end
 
       def drop_table(table_name, options = {})
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 862ce852e6..052ccde3d1 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -560,9 +560,8 @@ module ActiveRecord
       end
 
       def tables(name = nil, database = nil) #:nodoc:
-        tables = []
         result = execute(["SHOW TABLES", database].compact.join(' IN '), 'SCHEMA')
-        result.each { |field| tables << field[0] }
+        tables = result.collect { |field| field[0] }
         result.free
         tables
       end
@@ -607,9 +606,8 @@ module ActiveRecord
       # Returns an array of +MysqlColumn+ objects for the table specified by +table_name+.
       def columns(table_name, name = nil)#:nodoc:
         sql = "SHOW FIELDS FROM #{quote_table_name(table_name)}"
-        columns = []
         result = execute(sql, 'SCHEMA')
-        result.each { |field| columns << MysqlColumn.new(field[0], field[4], field[1], field[2] == "YES") }
+        columns = result.collect { |field| MysqlColumn.new(field[0], field[4], field[1], field[2] == "YES") }
         result.free
         columns
       end
diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb
index d9f85a4e5e..929998eb85 100644
--- a/activerecord/lib/active_record/query_cache.rb
+++ b/activerecord/lib/active_record/query_cache.rb
@@ -27,10 +27,31 @@ module ActiveRecord
       @app = app
     end
 
-    def call(env)
-      ActiveRecord::Base.cache do
-        @app.call(env)
+    class BodyProxy # :nodoc:
+      def initialize(original_cache_value, target)
+        @original_cache_value = original_cache_value
+        @target               = target
+      end
+
+      def each(&block)
+        @target.each(&block)
+      end
+
+      def close
+        @target.close if @target.respond_to?(:close)
+      ensure
+        unless @original_cache_value
+          ActiveRecord::Base.connection.disable_query_cache!
+        end
       end
     end
+
+    def call(env)
+      old = ActiveRecord::Base.connection.query_cache_enabled
+      ActiveRecord::Base.connection.enable_query_cache!
+
+      status, headers, body = @app.call(env)
+      [status, headers, BodyProxy.new(old, body)]
+    end
   end
 end