diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-09-23 15:58:34 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-09-23 15:58:34 -0700 |
| commit | e5299c1ef693ef434f55811027a7da975cd55ba5 (patch) | |
| tree | 24b28fc1f661c7cb41107416dabeb7c65e84d1fb /activerecord/lib/active_record/associations/preloader.rb | |
| parent | 6f9ea581da9381d4ce4422fe1dad1f55ee6f862a (diff) | |
| download | rails-e5299c1ef693ef434f55811027a7da975cd55ba5.tar.gz rails-e5299c1ef693ef434f55811027a7da975cd55ba5.tar.bz2 rails-e5299c1ef693ef434f55811027a7da975cd55ba5.zip | |
hm:t preloading will respect order set on the RHS association
Diffstat (limited to 'activerecord/lib/active_record/associations/preloader.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/preloader.rb b/activerecord/lib/active_record/associations/preloader.rb index 4ef361fccf..3add378386 100644 --- a/activerecord/lib/active_record/associations/preloader.rb +++ b/activerecord/lib/active_record/associations/preloader.rb @@ -127,7 +127,7 @@ module ActiveRecord loaders = preloaders_for_one parent, records - recs = loaders.flat_map(&:target_records).uniq + recs = loaders.flat_map(&:preloaded_records).uniq loaders.concat Array.wrap(child).flat_map { |assoc| preloaders_on assoc, recs } |