diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-01-15 01:45:51 +0900 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2017-02-06 22:41:44 -0700 |
| commit | 28977f1fa3d7b15c1608174a165e60b71ddf3995 (patch) | |
| tree | 9aab1ec695f9c01b6be74e95b73230946624e893 /activerecord/lib | |
| parent | 968e66b5df92e5ae88c033dc552e17b4c736874b (diff) | |
| download | rails-28977f1fa3d7b15c1608174a165e60b71ddf3995.tar.gz rails-28977f1fa3d7b15c1608174a165e60b71ddf3995.tar.bz2 rails-28977f1fa3d7b15c1608174a165e60b71ddf3995.zip | |
Remove useless `column_alias` in `subquery_for_count`
If select clause is specified and last column has a column alias,
additional column alias causes a statement invalid.
Add test coverage for counting a single column with NULL values.
Fixes #27676, #27682, and #27705.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index 35c670f1a1..e8aba02611 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -364,15 +364,14 @@ 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).as(column_alias) + aliased_column = aggregate_column(column_name == :all ? "1" : column_name) relation.select_values = [aliased_column] subquery = relation.arel.as(subquery_alias) sm = Arel::SelectManager.new relation.engine - select_value = operation_over_aggregate_column(column_alias, "count", distinct) + select_value = operation_over_aggregate_column(Arel.star, "count", distinct) sm.project(select_value).from(subquery) end end |