diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-26 23:40:38 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-26 23:40:38 -0300 |
| commit | 5462ffa08e84000e66f9f4b9ce5f47a7f62dc640 (patch) | |
| tree | 8bff44baa6323c35f10bb63837f948414be13d3c | |
| parent | 08f57dbc8d3cca21c35dc2ed42d85cf2a0ce4cd4 (diff) | |
| parent | b13d260b11fc8415510e3d40ebb5d084a6f28518 (diff) | |
| download | rails-5462ffa08e84000e66f9f4b9ce5f47a7f62dc640.tar.gz rails-5462ffa08e84000e66f9f4b9ce5f47a7f62dc640.tar.bz2 rails-5462ffa08e84000e66f9f4b9ce5f47a7f62dc640.zip | |
Merge pull request #15301 from zzak/issue_15212
Skip if the association was already loaded.
| -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 |