diff options
| author | Zachary Scott <e@zzak.io> | 2014-05-24 13:22:52 -0700 |
|---|---|---|
| committer | Zachary Scott <e@zzak.io> | 2014-05-24 13:22:52 -0700 |
| commit | b13d260b11fc8415510e3d40ebb5d084a6f28518 (patch) | |
| tree | 95b5315db39d4448bd9f653a1af3e5168406b487 /activerecord/lib/active_record | |
| parent | ade105be402f178eae2eb3aaa7f221097a55eb2a (diff) | |
| download | rails-b13d260b11fc8415510e3d40ebb5d084a6f28518.tar.gz rails-b13d260b11fc8415510e3d40ebb5d084a6f28518.tar.bz2 rails-b13d260b11fc8415510e3d40ebb5d084a6f28518.zip | |
Skip if the association was already loaded.
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/preloader.rb b/activerecord/lib/active_record/associations/preloader.rb index 42571d6af0..7519fec10a 100644 --- a/activerecord/lib/active_record/associations/preloader.rb +++ b/activerecord/lib/active_record/associations/preloader.rb @@ -143,6 +143,7 @@ module ActiveRecord def grouped_records(association, records) h = {} records.each do |record| + next unless record assoc = record.association(association) klasses = h[assoc.reflection] ||= {} (klasses[assoc.klass] ||= []) << record |