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 | |
| 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
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/calculations_test.rb | 6 | ||||
| -rw-r--r-- | activerecord/test/cases/relations_test.rb | 6 |
3 files changed, 13 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? diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb index 0828d6b58f..74228b2796 100644 --- a/activerecord/test/cases/calculations_test.rb +++ b/activerecord/test/cases/calculations_test.rb @@ -242,6 +242,12 @@ class CalculationsTest < ActiveRecord::TestCase assert_queries(1) { assert_equal 11, posts.count(:all) } end + def test_count_with_eager_loading_and_custom_order_and_distinct + posts = Post.includes(:comments).order("comments.id").distinct + assert_queries(1) { assert_equal 11, posts.count } + assert_queries(1) { assert_equal 11, posts.count(:all) } + end + def test_distinct_count_all_with_custom_select_and_order accounts = Account.distinct.select("credit_limit % 10").order(Arel.sql("credit_limit % 10")) assert_queries(1) { assert_equal 3, accounts.count(:all) } diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb index 18e0bed5b6..cf65789b97 100644 --- a/activerecord/test/cases/relations_test.rb +++ b/activerecord/test/cases/relations_test.rb @@ -976,6 +976,12 @@ class RelationTest < ActiveRecord::TestCase assert_queries(1) { assert_equal 11, posts.load.size } end + def test_size_with_eager_loading_and_custom_order_and_distinct + posts = Post.includes(:comments).order("comments.id").distinct + assert_queries(1) { assert_equal 11, posts.size } + assert_queries(1) { assert_equal 11, posts.load.size } + end + def test_update_all_with_scope tag = Tag.first Post.tagged_with(tag.id).update_all title: "rofl" |