From 1b961765871eba76d50d463d3af6c3c5926f537a Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Sun, 2 Dec 2012 21:24:47 +0100
Subject: backport #8403, no intermediate AR objects when eager loading.

Closes #3313

Conflicts:

	activerecord/CHANGELOG.md
	activerecord/test/models/developer.rb
---
 activerecord/test/models/developer.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'activerecord/test/models')

diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb
index 4dc9fff9fd..a730d86586 100644
--- a/activerecord/test/models/developer.rb
+++ b/activerecord/test/models/developer.rb
@@ -63,6 +63,15 @@ class Developer < ActiveRecord::Base
       self.all
     end
   end
+
+  after_find :track_instance_count
+  cattr_accessor :instance_count
+
+  def track_instance_count
+    self.class.instance_count ||= 0
+    self.class.instance_count += 1
+  end
+  private :track_instance_count
 end
 
 class AuditLog < ActiveRecord::Base
-- 
cgit v1.2.3