From adcd3079970ea7ef715ddfb8d2a386971d73eb52 Mon Sep 17 00:00:00 2001
From: John Hawthorn <john@stembolt.com>
Date: Tue, 20 Jun 2017 17:35:13 -0700
Subject: Move clearing of @offsets cache to reset_scope

---
 activerecord/lib/active_record/associations/collection_proxy.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
index 88b05bbcfa..d77fcaf668 100644
--- a/activerecord/lib/active_record/associations/collection_proxy.rb
+++ b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -1088,7 +1088,6 @@ module ActiveRecord
       #   # => [#<Pet id: 1, name: "Snoop", group: "dogs", person_id: 1>]
       def reload
         proxy_association.reload
-        @offsets = {}
         reset_scope
       end
 
@@ -1111,11 +1110,11 @@ module ActiveRecord
       def reset
         proxy_association.reset
         proxy_association.reset_scope
-        @offsets = {}
         reset_scope
       end
 
       def reset_scope # :nodoc:
+        @offsets = {}
         @scope = nil
         self
       end
-- 
cgit v1.2.3