diff options
| author | Rafael Sales <rafaelcds@gmail.com> | 2015-10-13 09:06:50 -0300 |
|---|---|---|
| committer | Rafael Sales <rafaelcds@gmail.com> | 2015-10-22 04:23:56 -0300 |
| commit | 4f21d42faaf12955fa0116306966d4ef09e62462 (patch) | |
| tree | 99ab3fe330485d4f4dc01b7c7725796504e046c0 /activerecord/lib/active_record/relation | |
| parent | c2d33c4abf01ec25b2d1528a7dae923aef5a30af (diff) | |
| download | rails-4f21d42faaf12955fa0116306966d4ef09e62462.tar.gz rails-4f21d42faaf12955fa0116306966d4ef09e62462.tar.bz2 rails-4f21d42faaf12955fa0116306966d4ef09e62462.zip | |
Refactor Calculations#execute_grouped_calculation and clean AR test case
* When tried to use `Company#accounts` test/models/company.rb I got:
```
ActiveRecord::StatementInvalid: SQLite3::SQLException: no such column:
accounts.company_id: SELECT COUNT(*) AS count_all, "companies"."firm_id"
AS companies_firm_id FROM "companies" INNER JOIN "accounts" ON
"accounts"."company_id" = "companies"."id" GROUP BY "companies"."firm_id"
```
* The refactor on Calculations class was just to simplify the code
Diffstat (limited to 'activerecord/lib/active_record/relation')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index 6d3e5327fb..f45844a9ea 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -277,14 +277,8 @@ module ActiveRecord end group_fields = arel_columns(group_fields) - group_aliases = group_fields.map { |field| - column_alias_for(field) - } - group_columns = group_aliases.zip(group_fields).map { |aliaz,field| - [aliaz, field] - } - - group = group_fields + group_aliases = group_fields.map { |field| column_alias_for(field) } + group_columns = group_aliases.zip(group_fields) if operation == 'count' && column_name == :all aggregate_alias = 'count_all' @@ -300,7 +294,7 @@ module ActiveRecord ] select_values += select_values unless having_clause.empty? - select_values.concat group_fields.zip(group_aliases).map { |field,aliaz| + select_values.concat group_columns.map { |aliaz, field| if field.respond_to?(:as) field.as(aliaz) else @@ -309,7 +303,7 @@ module ActiveRecord } relation = except(:group) - relation.group_values = group + relation.group_values = group_fields relation.select_values = select_values calculated_data = @klass.connection.select_all(relation, nil, relation.bound_attributes) |