diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-02-27 22:18:22 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2018-02-27 22:22:04 +0900 |
| commit | f1878fa06efb2eaa2c521022fa79f95b6c49f865 (patch) | |
| tree | 574fbd588987e18ee1c50b61f7c7b1483623c259 /activerecord/lib | |
| parent | dd943ef0b9d1733523478afcf4992ac078d299d0 (diff) | |
| parent | 5120bc90c236d5afed614a80de3431fdd14768dc (diff) | |
| download | rails-f1878fa06efb2eaa2c521022fa79f95b6c49f865.tar.gz rails-f1878fa06efb2eaa2c521022fa79f95b6c49f865.tar.bz2 rails-f1878fa06efb2eaa2c521022fa79f95b6c49f865.zip | |
Merge pull request #32005 from maschwenk/ar-distinct-order-count-regression
Active Record distinct & order #count regression
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index 6a63eb70b1..f215c95f51 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -132,7 +132,7 @@ module ActiveRecord if has_include?(column_name) relation = apply_join_dependency - if operation.to_s.downcase == "count" && !distinct_value + if operation.to_s.downcase == "count" relation.distinct! # PostgreSQL: ORDER BY expressions must appear in SELECT list when using DISTINCT if (column_name == :all || column_name.nil?) && select_values.empty? |