1 files changed, 8 insertions, 24 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 78fffaff6e..1db397f584 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/object/duplicable'
-
 module ActiveRecord
   module ConnectionAdapters # :nodoc:
     module QueryCache
@@ -49,40 +47,26 @@ module ActiveRecord
         @query_cache.clear
       end
 
-      def select_all(*args)
-        if @query_cache_enabled
-          cache_sql(args.first) { super }
-        else
-          super
-        end
-      end
-
-      def columns(*)
+      def select_all(sql, name = nil, binds = [])
         if @query_cache_enabled
-          @query_cache["SHOW FIELDS FROM #{args.first}"] ||= super
+          cache_sql(sql, binds) { super }
         else
           super
         end
       end
 
       private
-        def cache_sql(sql)
+        def cache_sql(sql, binds)
           result =
-            if @query_cache.has_key?(sql)
+            if @query_cache[sql].key?(binds)
               ActiveSupport::Notifications.instrument("sql.active_record",
-                :sql => sql, :name => "CACHE", :connection_id => self.object_id)
-              @query_cache[sql]
+                :sql => sql, :name => "CACHE", :connection_id => object_id)
+              @query_cache[sql][binds]
             else
-              @query_cache[sql] = yield
+              @query_cache[sql][binds] = yield
             end
 
-          if Array === result
-            result.collect { |row| row.dup }
-          else
-            result.duplicable? ? result.dup : result
-          end
-        rescue TypeError
-          result
+          result.collect { |row| row.dup }
         end
     end
   end