aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2006-03-14 14:59:14 +0000
committerRick Olson <technoweenie@gmail.com>2006-03-14 14:59:14 +0000
commit796a43dead8ebf2fb9d28a25cb90e83c9baab4a0 (patch)
treee42b0751747544e5a14d2916ee51205173d586cd /activerecord/lib
parentc6abe81b1eebd741b2a36e6618bf6f1c07b87588 (diff)
downloadrails-796a43dead8ebf2fb9d28a25cb90e83c9baab4a0.tar.gz
rails-796a43dead8ebf2fb9d28a25cb90e83c9baab4a0.tar.bz2
rails-796a43dead8ebf2fb9d28a25cb90e83c9baab4a0.zip
Allow ordering of calculated results and/or grouped fields in calculations [solo@gatelys.com] closes #4228
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3865 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/calculations.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb
index 8988ebf4e8..6c5ae3edca 100644
--- a/activerecord/lib/active_record/calculations.rb
+++ b/activerecord/lib/active_record/calculations.rb
@@ -151,6 +151,7 @@ module ActiveRecord
add_conditions!(sql, options[:conditions])
sql << " GROUP BY #{options[:group_field]}" if options[:group]
sql << " HAVING #{options[:having]}" if options[:group] && options[:having]
+ sql << " ORDER BY #{options[:order]}" if options[:order]
sql.join
end