aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorBogdan Gusiev <agresso@gmail.com>2019-06-06 14:56:25 +0300
committerBogdan Gusiev <agresso@gmail.com>2019-06-06 15:14:40 +0300
commit30c1999df1f50df3faa663efb90e641ff0c2d425 (patch)
treea67b3cba9b1466b27f59a9b6bc2497008c8ade45 /activerecord/lib/active_record
parent30b03ad73bad126538f4c6199522ccd007f101d5 (diff)
downloadrails-30c1999df1f50df3faa663efb90e641ff0c2d425.tar.gz
rails-30c1999df1f50df3faa663efb90e641ff0c2d425.tar.bz2
rails-30c1999df1f50df3faa663efb90e641ff0c2d425.zip
Fix preloading on AR::Relation where records are duplicated by a join
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/associations/preloader/association.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb
index 342d9e7a5a..4c7b0e6f07 100644
--- a/activerecord/lib/active_record/associations/preloader/association.rb
+++ b/activerecord/lib/active_record/associations/preloader/association.rb
@@ -27,7 +27,9 @@ module ActiveRecord
end
def records_by_owner
- @records_by_owner ||= preloaded_records.each_with_object({}) do |record, result|
+ # owners can be duplicated when a relation has a collection association join
+ # #compare_by_identity makes such owners different hash keys
+ @records_by_owner ||= preloaded_records.each_with_object({}.compare_by_identity) do |record, result|
owners_by_key[convert_key(record[association_key_name])].each do |owner|
(result[owner] ||= []) << record
end