diff options
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/through_association.rb | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/through_association.rb b/activerecord/lib/active_record/associations/preloader/through_association.rb index 3166df57eb..63d4253e6a 100644 --- a/activerecord/lib/active_record/associations/preloader/through_association.rb +++ b/activerecord/lib/active_record/associations/preloader/through_association.rb @@ -35,6 +35,15 @@ module ActiveRecord } end + pl_indexes = preloaders.each_with_object({}) do |pl,hash| + i = 0 + loaded_records = pl.preloaded_records + hash[pl] = loaded_records.each_with_object({}) { |r,indexes| + indexes[r] = i + i += 1 + } + end + through_records.each_with_object({}) { |(lhs,center),records_by_owner| pl_to_middle = center.group_by { |record| middle_to_pl[record] } @@ -43,12 +52,7 @@ module ActiveRecord r.send(source_reflection.name) }.compact - loaded_records = pl.preloaded_records - i = 0 - record_index = loaded_records.each_with_object({}) { |r,indexes| - indexes[r] = i - i += 1 - } + record_index = pl_indexes[pl] records = rhs_records.sort_by { |rhs| record_index[rhs] } @preloaded_records.concat rhs_records records |