diff options
| author | Matt Duncan <mrduncan@gmail.com> | 2009-08-08 20:10:01 -0400 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2009-08-09 12:43:07 +1200 |
| commit | 3b3798506b403911665c3c24fd055b75d6f6a44f (patch) | |
| tree | 37de7c99f0efbb990cc2f3b62f81c05921ad592b /activerecord/lib/active_record/calculations.rb | |
| parent | 1f6afe4a74bb815a33f41b2d75acd530de6e2eba (diff) | |
| download | rails-3b3798506b403911665c3c24fd055b75d6f6a44f.tar.gz rails-3b3798506b403911665c3c24fd055b75d6f6a44f.tar.bz2 rails-3b3798506b403911665c3c24fd055b75d6f6a44f.zip | |
Adding :from scoping to ActiveRecord calculations
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1229 state:committed]
Diffstat (limited to 'activerecord/lib/active_record/calculations.rb')
| -rw-r--r-- | activerecord/lib/active_record/calculations.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb index 727f4c1dc6..4a88c43dff 100644 --- a/activerecord/lib/active_record/calculations.rb +++ b/activerecord/lib/active_record/calculations.rb @@ -197,6 +197,8 @@ module ActiveRecord sql << ", #{options[:group_field]} AS #{options[:group_alias]}" if options[:group] if options[:from] sql << " FROM #{options[:from]} " + elsif scope && scope[:from] + sql << " FROM #{scope[:from]} " else sql << " FROM (SELECT #{distinct}#{column_name}" if use_workaround sql << " FROM #{connection.quote_table_name(table_name)} " |