diff options
| author | Eugene Kenny <elkenny@gmail.com> | 2017-02-26 12:44:05 +0000 |
|---|---|---|
| committer | Eugene Kenny <elkenny@gmail.com> | 2017-02-26 12:44:05 +0000 |
| commit | 18125683ac2a23971b64a79d256ba6e252304c6f (patch) | |
| tree | d2aa6e8c25334002fdfdbfccc0730fa59c105dac /activerecord | |
| parent | 38d05cee5342094bba0ef17d25f5cf5d0eccfbb5 (diff) | |
| download | rails-18125683ac2a23971b64a79d256ba6e252304c6f.tar.gz rails-18125683ac2a23971b64a79d256ba6e252304c6f.tar.bz2 rails-18125683ac2a23971b64a79d256ba6e252304c6f.zip | |
Include selects in group query with having clause
When a grouped calculation contains a having clause that references a
selected value, we need to include that selected value in the query.
Postgres doesn't support referencing a selected value in a having
clause, but other databases do; we can skip the test on the pg adapter
but run it for the others.
This was fixed before in 9a298a162c16e019fe6971e563e7f4916e86ced6, but
the test coverage was lost in 5a05207d99b7e2678f9b42db2d9ffc21ec2c8c3b.
The fix regressed in 6311975fb3c02f50730fd1e11b8dba8dd9c05306 and was
removed in 97d46c17ea9113b0ce970167f5208c8d9170915c.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 1 | ||||
| -rw-r--r-- | activerecord/test/cases/calculations_test.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index 973678704f..f4cdaf3948 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -282,6 +282,7 @@ module ActiveRecord operation, distinct).as(aggregate_alias) ] + select_values += self.select_values unless having_clause.empty? select_values.concat group_columns.map { |aliaz, field| if field.respond_to?(:as) diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb index acea955021..e70af43155 100644 --- a/activerecord/test/cases/calculations_test.rb +++ b/activerecord/test/cases/calculations_test.rb @@ -246,7 +246,8 @@ class CalculationsTest < ActiveRecord::TestCase end def test_should_group_by_summed_field_having_condition_from_select - c = Account.select("MIN(credit_limit) AS min_credit_limit").group(:firm_id).having("MIN(credit_limit) > 50").sum(:credit_limit) + skip if current_adapter?(:PostgreSQLAdapter) + c = Account.select("MIN(credit_limit) AS min_credit_limit").group(:firm_id).having("min_credit_limit > 50").sum(:credit_limit) assert_nil c[1] assert_equal 60, c[2] assert_equal 53, c[9] |