kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix an issue with duplicate preloaded records

Browse source 
Fixes #37446
This commit is contained in:
sinsoku 2019-10-13 03:18:39 +09:00
parent cd30ec1fe5
commit 4b455e4f32
No known key found for this signature in database
GPG key ID: 92BA66D80B19ADF2
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/lib/active_record/associations/preloader.rb
View file

@ -111,7 +111,7 @@ module ActiveRecord
association.flat_map { |parent, child|
grouped_records(parent, records, polymorphic_parent).flat_map do |reflection, reflection_records|
loaders = preloaders_for_reflection(reflection, reflection_records, scope)
recs = loaders.flat_map(&:preloaded_records)
recs = loaders.flat_map(&:preloaded_records).uniq
child_polymorphic_parent = reflection && reflection.options[:polymorphic]
loaders.concat Array.wrap(child).flat_map { |assoc|
preloaders_on assoc, recs, scope, child_polymorphic_parent

11
activerecord/test/cases/associations/cascaded_eager_loading_test.rb
View file

@ -190,4 +190,15 @@ class CascadedEagerLoadingTest < ActiveRecord::TestCase
assert_equal 3, authors[1].posts.size
assert_equal 3, authors[0].posts.collect { |post| post.categorizations.size }.inject(0) { |sum, i| sum + i }
end
# Regression test for https://github.com/rails/rails/issues/37446
def test_preloaded_records_are_not_duplicated
author = Author.first
expected = Post.where(author: author)
.includes(author: :first_posts).map { |post| post.author.first_posts.size }
actual = author.posts
.includes(author: :first_posts).map { |post| post.author.first_posts.size }
assert_equal expected, actual
end
end