diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-11-07 00:18:07 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-11-07 00:18:07 +0000 |
| commit | a3dba1ed7cabc53d474c37eba973d617445b389e (patch) | |
| tree | 91a0d986979c3210237b1dd75573aa157bcc48fb /activerecord/lib/active_record/associations.rb | |
| parent | a7d0e0e011928a77abb8630ce61f219ec80e86f4 (diff) | |
| download | rails-a3dba1ed7cabc53d474c37eba973d617445b389e.tar.gz rails-a3dba1ed7cabc53d474c37eba973d617445b389e.tar.bz2 rails-a3dba1ed7cabc53d474c37eba973d617445b389e.zip | |
Find with :include respects scoped :order. Closes #5850.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5445 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 8a1b6ca933..f9713199d5 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1169,8 +1169,8 @@ module ActiveRecord add_limited_ids_condition!(sql, options, join_dependency) if !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit]) sql << "GROUP BY #{options[:group]} " if options[:group] - sql << "ORDER BY #{options[:order]} " if options[:order] + add_order!(sql, options[:order]) add_limit!(sql, options, scope) if using_limitable_reflections?(join_dependency.reflections) return sanitize_sql(sql) |