diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2017-02-07 00:15:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-07 00:15:00 -0700 |
| commit | adaa35890b52fe491827a3ab295900c21f35df6f (patch) | |
| tree | 157e39917bb261efdffd83fcec8b26ab038f4931 /activerecord/lib | |
| parent | 383c4de2df17cd4168274c96e379292262f29189 (diff) | |
| parent | 401354b298953a7d83eaef8ab703476991c3e9d4 (diff) | |
| download | rails-adaa35890b52fe491827a3ab295900c21f35df6f.tar.gz rails-adaa35890b52fe491827a3ab295900c21f35df6f.tar.bz2 rails-adaa35890b52fe491827a3ab295900c21f35df6f.zip | |
Merge pull request #27933 from kamipo/revert_27682
Revert "Remove useless `column_alias` in `subquery_for_count`"
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index e8aba02611..35c670f1a1 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -364,14 +364,15 @@ module ActiveRecord end def build_count_subquery(relation, column_name, distinct) + column_alias = Arel.sql("count_column") subquery_alias = Arel.sql("subquery_for_count") - aliased_column = aggregate_column(column_name == :all ? "1" : column_name) + aliased_column = aggregate_column(column_name == :all ? 1 : column_name).as(column_alias) relation.select_values = [aliased_column] subquery = relation.arel.as(subquery_alias) sm = Arel::SelectManager.new relation.engine - select_value = operation_over_aggregate_column(Arel.star, "count", distinct) + select_value = operation_over_aggregate_column(column_alias, "count", distinct) sm.project(select_value).from(subquery) end end |