diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-10 23:11:05 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-10 23:11:05 -0700 |
| commit | 19ad375e7afa99dc8bc5d859c478bae19c5ddc18 (patch) | |
| tree | f5b1c4776ad408e9445b3c54fbe35588243ac0c2 /activerecord/lib | |
| parent | cfde60575a646549b47990befc037fa73a9dc393 (diff) | |
| download | rails-19ad375e7afa99dc8bc5d859c478bae19c5ddc18.tar.gz rails-19ad375e7afa99dc8bc5d859c478bae19c5ddc18.tar.bz2 rails-19ad375e7afa99dc8bc5d859c478bae19c5ddc18.zip | |
Don't duplicate :order from scope and options, it makes mysql do extra work
Diffstat (limited to 'activerecord/lib')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 4f39761672..62bdf0483a 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1741,7 +1741,9 @@ module ActiveRecord #:nodoc: scoped_order = scope[:order] if scope if order sql << " ORDER BY #{order}" - sql << ", #{scoped_order}" if scoped_order + if scoped_order && scoped_order != order + sql << ", #{scoped_order}" + end else sql << " ORDER BY #{scoped_order}" if scoped_order end |