From c8b6b4821ff3f8135a22728bdf989e585a38d343 Mon Sep 17 00:00:00 2001 From: Marcel Molina Date: Tue, 23 Oct 2007 18:34:01 +0000 Subject: 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 --- activerecord/lib/active_record/associations.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'activerecord/lib/active_record') 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) -- cgit v1.2.3