diff options
| author | siddharth@vinsol.com <siddharth@vinsol.com> | 2014-11-20 01:35:04 +0530 |
|---|---|---|
| committer | siddharth@vinsol.com <siddharth@vinsol.com> | 2014-11-21 21:13:11 +0530 |
| commit | 91e3dab804fffe0b1daebb438091418faa1fa256 (patch) | |
| tree | 9ac7acc6a00c82e787cb010d15d9c9be666fa667 /activerecord/lib/active_record/associations/preloader | |
| parent | 7e375afba30951b60a3e606ccbfe3f28b0df5e1a (diff) | |
| download | rails-91e3dab804fffe0b1daebb438091418faa1fa256.tar.gz rails-91e3dab804fffe0b1daebb438091418faa1fa256.tar.bz2 rails-91e3dab804fffe0b1daebb438091418faa1fa256.zip | |
Fix includes on association with a scope containing joins along with conditions
on the joined assoiciation
Diffstat (limited to 'activerecord/lib/active_record/associations/preloader')
| -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! |