diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2019-06-07 07:38:27 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-07 07:38:27 +0900 |
| commit | e3c1f42b31b93c87188a3013a3f40cf994b7d33c (patch) | |
| tree | 3087c00a6f02f477bbadd8c0a81416d66b9f05a0 /activerecord/lib | |
| parent | 1126d14c144c79745779496f39640ce066b95d1d (diff) | |
| parent | 30c1999df1f50df3faa663efb90e641ff0c2d425 (diff) | |
| download | rails-e3c1f42b31b93c87188a3013a3f40cf994b7d33c.tar.gz rails-e3c1f42b31b93c87188a3013a3f40cf994b7d33c.tar.bz2 rails-e3c1f42b31b93c87188a3013a3f40cf994b7d33c.zip | |
Merge pull request #36429 from bogdan/fix-preloading-duplicate-records
Fix preloading on AR::Relation where records are duplicated by a join
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/association.rb | 4 |
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 |