diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-03-22 15:02:49 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-03-22 15:08:09 +0100 |
| commit | c8edd4fda45bbc7c99beaaf2d53f4de59c3fac54 (patch) | |
| tree | 6a6fd983c2590c53661d8e0f9e5612968ba28659 /activerecord/lib/active_record | |
| parent | 69599b63de927091faf1d804b6457f65014080d6 (diff) | |
| download | rails-c8edd4fda45bbc7c99beaaf2d53f4de59c3fac54.tar.gz rails-c8edd4fda45bbc7c99beaaf2d53f4de59c3fac54.tar.bz2 rails-c8edd4fda45bbc7c99beaaf2d53f4de59c3fac54.zip | |
do not reset associations when preloading twice.
Closes #9806.
As the `through_options` always contained `{:order=>nil}` the second time,
the preloader ran, the association was always reset. This patch only
adds the `:order` to the `through_options` if it is set.
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/through_association.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/through_association.rb b/activerecord/lib/active_record/associations/preloader/through_association.rb index 4cb7b56b57..e052b00403 100644 --- a/activerecord/lib/active_record/associations/preloader/through_association.rb +++ b/activerecord/lib/active_record/associations/preloader/through_association.rb @@ -56,8 +56,7 @@ module ActiveRecord through_options[:include] = options[:include] || options[:source] through_options[:conditions] = options[:conditions] end - - through_options[:order] = options[:order] + through_options[:order] = options[:order] if options.has_key?(:order) end through_options |