From ceee776b5ddf3db849bdf170be15de5a86eb28d5 Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Mon, 25 Jul 2016 00:00:38 +0900
Subject: Fix to `CollectionProxy#load` does `load_target`

---
 activerecord/lib/active_record/associations/collection_proxy.rb | 6 ++++++
 activerecord/test/cases/associations_test.rb                    | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
index db3037d8f9..98250a7ab8 100644
--- a/activerecord/lib/active_record/associations/collection_proxy.rb
+++ b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -1070,6 +1070,12 @@ module ActiveRecord
         proxy_association.reset_scope
         self
       end
+
+      private
+
+        def exec_queries
+          load_target
+        end
     end
   end
 end
diff --git a/activerecord/test/cases/associations_test.rb b/activerecord/test/cases/associations_test.rb
index 01a058918a..8f570985ff 100644
--- a/activerecord/test/cases/associations_test.rb
+++ b/activerecord/test/cases/associations_test.rb
@@ -183,6 +183,14 @@ class AssociationProxyTest < ActiveRecord::TestCase
     assert !david.projects.loaded?
   end
 
+  def test_load_does_load_target
+    david = developers(:david)
+
+    assert !david.projects.loaded?
+    david.projects.load
+    assert david.projects.loaded?
+  end
+
   def test_inspect_does_not_reload_a_not_yet_loaded_target
     andreas = Developer.new :name => 'Andreas', :log => 'new developer added'
     assert !andreas.audit_logs.loaded?
-- 
cgit v1.2.3