diff options
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/association_preload.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb index 065ecf5bf0..54a964f53b 100644 --- a/activerecord/lib/active_record/association_preload.rb +++ b/activerecord/lib/active_record/association_preload.rb @@ -199,8 +199,10 @@ module ActiveRecord select("#{options[:select] || table_name+'.*'}, t0.#{reflection.primary_key_name} as the_parent_record_id"). order(options[:order]) - all_associated_records = associated_records(ids) do |some_ids| - associated_records_proxy.where([conditions, ids]).to_a + all_associated_records = ActiveRecord::IdentityMap.without do + associated_records(ids) do |some_ids| + associated_records_proxy.where([conditions, ids]).to_a + end end set_association_collection_records(id_to_record_map, reflection.name, all_associated_records, 'the_parent_record_id') |