diff --git a/activerecord/lib/active_record/associations/preloader/through_association.rb b/activerecord/lib/active_record/associations/preloader/through_association.rb index 15fdba51f38312d0cb5c56132a7cfd6c89ee857f..7187cf38fd3aef2ad9e6397dde0103b2f7ce29c0 100644 --- a/activerecord/lib/active_record/associations/preloader/through_association.rb +++ b/activerecord/lib/active_record/associations/preloader/through_association.rb @@ -52,17 +52,13 @@ def associated_records_by_owner(preloader) r.send(source_reflection.name) }.compact - if pl - loaded_records = pl.preloaded_records - i = 0 - record_index = loaded_records.each_with_object({}) { |r,indexes| - indexes[r] = i - i += 1 - } - rhs_records.sort_by { |rhs| record_index[rhs] } - else - rhs_records - end + loaded_records = pl.preloaded_records + i = 0 + record_index = loaded_records.each_with_object({}) { |r,indexes| + indexes[r] = i + i += 1 + } + rhs_records.sort_by { |rhs| record_index[rhs] } end } end