diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-27 23:28:19 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-27 23:28:19 +0000 |
| commit | c9c185200df71c8aaa5ed42e39531191e76690e4 (patch) | |
| tree | afa828027a407471ae7687439f935b8094eb91b4 /activerecord/lib/active_record/calculations.rb | |
| parent | 1cc2f5ce9f2e343532cfe2b9554f62d363f37afb (diff) | |
| download | rails-c9c185200df71c8aaa5ed42e39531191e76690e4.tar.gz rails-c9c185200df71c8aaa5ed42e39531191e76690e4.tar.bz2 rails-c9c185200df71c8aaa5ed42e39531191e76690e4.zip | |
Making ActiveRecord faster [skaes]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4069 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/calculations.rb')
| -rw-r--r-- | activerecord/lib/active_record/calculations.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb index 774926f409..59a7647213 100644 --- a/activerecord/lib/active_record/calculations.rb +++ b/activerecord/lib/active_record/calculations.rb @@ -144,11 +144,12 @@ module ActiveRecord protected def construct_calculation_sql(aggregate, aggregate_alias, options) + scope = scope(:find) sql = ["SELECT #{aggregate} AS #{aggregate_alias}"] sql << ", #{options[:group_field]} AS #{options[:group_alias]}" if options[:group] sql << " FROM #{table_name} " - add_joins!(sql, options) - add_conditions!(sql, options[:conditions]) + add_joins!(sql, options, scope) + add_conditions!(sql, options[:conditions], scope) 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] |