diff options
| author | Marcel Molina <marcel@vernix.org> | 2007-10-23 18:34:01 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2007-10-23 18:34:01 +0000 |
| commit | c8b6b4821ff3f8135a22728bdf989e585a38d343 (patch) | |
| tree | 71d2f4f0189f02c004adfc2eb7589b51427eddba /activerecord/lib/active_record | |
| parent | 6f559f871e9278aea65471f1ce31fab15536f56a (diff) | |
| download | rails-c8b6b4821ff3f8135a22728bdf989e585a38d343.tar.gz rails-c8b6b4821ff3f8135a22728bdf989e585a38d343.tar.bz2 rails-c8b6b4821ff3f8135a22728bdf989e585a38d343.zip | |
Limited eager loading no longer ignores scoped :order. Closes #9561 [danger, josh]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8006 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 0d440a75fd..b64b339781 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1293,12 +1293,10 @@ module ActiveRecord add_conditions!(sql, options[:conditions], scope) add_group!(sql, options[:group], scope) - if options[:order] - if is_distinct - connection.add_order_by_for_association_limiting!(sql, options) - else - add_order!(sql, options[:order], scope) - end + if options[:order] && is_distinct + connection.add_order_by_for_association_limiting!(sql, options) + else + add_order!(sql, options[:order], scope) end add_limit!(sql, options, scope) |