From 2eee8af4d058b60323b60dd1a56c247e485c0835 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 14 Oct 2014 16:39:57 -0700
Subject: make sure cache is not used for collection assocations too

follow up for #17052
---
 .../lib/active_record/associations/collection_association.rb       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'activerecord/lib/active_record/associations/collection_association.rb')

diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
index 1836ff0910..bdfd569be2 100644
--- a/activerecord/lib/active_record/associations/collection_association.rb
+++ b/activerecord/lib/active_record/associations/collection_association.rb
@@ -407,7 +407,12 @@ module ActiveRecord
 
       private
       def get_records
-        return scope.to_a if reflection.scope_chain.any?(&:any?) || scope.eager_loading?
+        if reflection.scope_chain.any?(&:any?) ||
+          scope.eager_loading? ||
+          klass.current_scope
+
+          return scope.to_a
+        end
 
         conn = klass.connection
         sc = reflection.association_scope_cache(conn, owner) do
-- 
cgit v1.2.3