diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-09-20 17:12:44 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-09-20 17:12:44 -0700 |
| commit | 8988f0b8beec83a8ead61da93818270e82e76694 (patch) | |
| tree | 4fcbc6248598b3c82fdec9ecbd4a4e140c5d9415 /activerecord/lib/active_record/associations | |
| parent | bc77ccacbd7fe31a596be2b05a88048f2b832549 (diff) | |
| download | rails-8988f0b8beec83a8ead61da93818270e82e76694.tar.gz rails-8988f0b8beec83a8ead61da93818270e82e76694.tar.bz2 rails-8988f0b8beec83a8ead61da93818270e82e76694.zip | |
preserve order on the RHS query
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/association.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index 9b8750b9ea..a8edf21bef 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -133,6 +133,14 @@ module ActiveRecord scope.select! preload_values[:select] || values[:select] || table[Arel.star] scope.includes! preload_values[:includes] || values[:includes] + if preload_values.key? :order + scope.order! preload_values[:order] + else + if values.key? :order + scope.order! values[:order] + end + end + if options[:as] scope.where!(klass.table_name => { reflection.type => model.base_class.sti_name }) end |