aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/associations/preloader/through_association.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/through_association.rb b/activerecord/lib/active_record/associations/preloader/through_association.rb
index ad6374d09a..30558ae29c 100644
--- a/activerecord/lib/active_record/associations/preloader/through_association.rb
+++ b/activerecord/lib/active_record/associations/preloader/through_association.rb
@@ -33,8 +33,13 @@ module ActiveRecord
through_options
).run
+ # TODO: Verify that this is actually necessary and not just a symptom of an
+ # underlying inefficiency
+ identity_map = {}
+
Hash[owners.map do |owner|
through_records = Array.wrap(owner.send(through_reflection.name))
+ through_records.map! { |record| identity_map[record] ||= record }
# Dont cache the association - we would only be caching a subset
if reflection.options[:source_type] && through_reflection.collection?