diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-03-04 22:29:40 +0000 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-03-04 15:16:07 -0800 |
| commit | 8987cda2bb64fe289f7a28b2833a2786cfbc8259 (patch) | |
| tree | 03e42a7bacac2ba396bc479f9512794a6803a2fb /activerecord/lib/active_record/associations | |
| parent | af27262ec308784d2aaa59d48fd43bef5c2b9f89 (diff) | |
| download | rails-8987cda2bb64fe289f7a28b2833a2786cfbc8259.tar.gz rails-8987cda2bb64fe289f7a28b2833a2786cfbc8259.tar.bz2 rails-8987cda2bb64fe289f7a28b2833a2786cfbc8259.zip | |
When preloading has_and_belongs_to_many associations, we should only instantiate one AR object per actual record in the database. (Even when IM is off.)
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb b/activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb index e794f05340..24be279449 100644 --- a/activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb +++ b/activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb @@ -31,10 +31,12 @@ module ActiveRecord private # Once we have used the join table column (in super), we manually instantiate the - # actual records + # actual records, ensuring that we don't create more than one instances of the same + # record def associated_records_by_owner + records = {} super.each do |owner_key, rows| - rows.map! { |row| klass.instantiate(row) } + rows.map! { |row| records[row[klass.primary_key]] ||= klass.instantiate(row) } end end |