From f34d46ab824e3db121d0e02c7859b6aceb8093d9 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 23 Sep 2013 16:51:51 -0700
Subject: [PATCH] reuse the same preloader object for each association

---
 activerecord/lib/active_record/relation.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index efa8cf1c42..cfaf566ec4 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -599,9 +599,9 @@ def exec_queries
 
       preload = preload_values
       preload +=  includes_values unless eager_loading?
+      preloader = ActiveRecord::Associations::Preloader.new
       preload.each do |associations|
-        pl = ActiveRecord::Associations::Preloader.new
-        pl.preload @records, associations
+        preloader.preload @records, associations
       end
 
       @records.each { |record| record.readonly! } if readonly_value
-- 
GitLab