diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2014-11-24 14:55:34 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2014-11-24 14:55:34 -0200 |
| commit | e3acd74fa8cbe5c09321ee75dd387e9d8cb044fc (patch) | |
| tree | 03b48edff010244ca9f7f54588a1cd8ffdfe23f7 /activerecord/lib/active_record/associations/preloader/association.rb | |
| parent | 33c80cb69e183abb1212de0851565ef7f1c48cc4 (diff) | |
| parent | 91e3dab804fffe0b1daebb438091418faa1fa256 (diff) | |
| download | rails-e3acd74fa8cbe5c09321ee75dd387e9d8cb044fc.tar.gz rails-e3acd74fa8cbe5c09321ee75dd387e9d8cb044fc.tar.bz2 rails-e3acd74fa8cbe5c09321ee75dd387e9d8cb044fc.zip | |
Merge pull request #17678 from siddharth28/includes_with_scope_with_joins
Fix includes on association with a scope
Diffstat (limited to 'activerecord/lib/active_record/associations/preloader/association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/association.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index 496c426986..7d6523dbc4 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -142,14 +142,8 @@ 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 + scope.joins! preload_values[:joins] || values[:joins] + scope.order! preload_values[:order] || values[:order] if preload_values[:readonly] || values[:readonly] scope.readonly! |