diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-02 00:25:29 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-02 00:25:29 +0530 |
| commit | b35873a575586d31e9de681aec31d4b884b25aba (patch) | |
| tree | 40dd20edf2c2a8cb29c8c56f3fa748acae66da67 /activerecord/lib/active_record/relation/calculation_methods.rb | |
| parent | d2c4b3b672d52cddbc214e0fe5175cc92ca76f92 (diff) | |
| download | rails-b35873a575586d31e9de681aec31d4b884b25aba.tar.gz rails-b35873a575586d31e9de681aec31d4b884b25aba.tar.bz2 rails-b35873a575586d31e9de681aec31d4b884b25aba.zip | |
Rename Model.arel_table to Model.active_relation
Diffstat (limited to 'activerecord/lib/active_record/relation/calculation_methods.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculation_methods.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/calculation_methods.rb b/activerecord/lib/active_record/relation/calculation_methods.rb index a925a99464..5246c7bc5d 100644 --- a/activerecord/lib/active_record/relation/calculation_methods.rb +++ b/activerecord/lib/active_record/relation/calculation_methods.rb @@ -53,7 +53,7 @@ module ActiveRecord def execute_simple_calculation(operation, column_name, distinct) #:nodoc: column = if @klass.column_names.include?(column_name.to_s) - Arel::Attribute.new(@klass.arel_table, column_name) + Arel::Attribute.new(@klass.active_relation, column_name) else Arel::SqlLiteral.new(column_name == :all ? "*" : column_name.to_s) end @@ -77,7 +77,7 @@ module ActiveRecord select_statement = if operation == 'count' && column_name == :all "COUNT(*) AS count_all" else - Arel::Attribute.new(@klass.arel_table, column_name).send(operation).as(aggregate_alias).to_sql + Arel::Attribute.new(@klass.active_relation, column_name).send(operation).as(aggregate_alias).to_sql end select_statement << ", #{group_field} AS #{group_alias}" |