diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-07 14:33:35 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-07 14:33:35 -0300 |
| commit | 6b5fab9300c3e5f2852409ad589d2166373787e7 (patch) | |
| tree | c2eb97f5f7780355b72bd0edc4bd9561370879ae /activerecord | |
| parent | 04abe538ac80b8d82658acaa3de5ef6c961d3e39 (diff) | |
| download | rails-6b5fab9300c3e5f2852409ad589d2166373787e7.tar.gz rails-6b5fab9300c3e5f2852409ad589d2166373787e7.tar.bz2 rails-6b5fab9300c3e5f2852409ad589d2166373787e7.zip | |
Don't scope order in calculations.'
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/calculations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb index 3c75200f82..43e4529575 100644 --- a/activerecord/lib/active_record/calculations.rb +++ b/activerecord/lib/active_record/calculations.rb @@ -155,7 +155,7 @@ module ActiveRecord relation.where(construct_conditions(options[:conditions], scope)) relation.where(construct_arel_limited_ids_condition(options, join_dependency)) if join_dependency && !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit]) - relation.order(construct_order(options[:order], scope)) + relation.order(options[:order]) relation.take(options[:limit]) relation.skip(options[:offset]) |