diff options
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) |