aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/relations_test.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-04-04 17:32:28 +0900
committerGitHub <noreply@github.com>2019-04-04 17:32:28 +0900
commitc9981ae6e022023a46dbab2ace62f7eb256a0816 (patch)
tree24318e4f244c28480a936d8c76a282faf1b4ac24 /activerecord/test/cases/relations_test.rb
parent39d42dbde2571a9a713007c1a8e9f202e004cdeb (diff)
parent060e09dfb3637b03ef026c5e6b69432c08995c47 (diff)
downloadrails-c9981ae6e022023a46dbab2ace62f7eb256a0816.tar.gz
rails-c9981ae6e022023a46dbab2ace62f7eb256a0816.tar.bz2
rails-c9981ae6e022023a46dbab2ace62f7eb256a0816.zip
Merge pull request #35850 from kamipo/fix_count_all_with_eager_loading_and_select_and_order
Fix `count(:all)` with eager loading and explicit select and order
Diffstat (limited to 'activerecord/test/cases/relations_test.rb')
-rw-r--r--activerecord/test/cases/relations_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 131e034c66..2417775ef1 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -985,6 +985,12 @@ class RelationTest < ActiveRecord::TestCase
assert_queries(1) { assert_equal 11, posts.load.size }
end
+ def test_size_with_eager_loading_and_custom_select_and_order
+ posts = Post.includes(:comments).order("comments.id").select(:type)
+ assert_queries(1) { assert_equal 11, posts.size }
+ 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 }