Ticket #9167: test_eager_with_conditional_properly_counts_the_records_stable.diff

activerecord/test/associations/eager_test.rb

@@ -271 +271 @@
-    assert_not_nil f.account
-    assert_equal companies(:first_firm, :reload).account, f.account
-  end
+  
+  def test_eager_with_multi_table_conditional_properly_counts_the_records_when_using_size
+    author = authors(:david)
+    posts_with_no_comments = author.posts.select { |post| post.comments.blank? }
+    assert_equal posts_with_no_comments.size, author.posts_with_no_comments.size
+    assert_equal posts_with_no_comments, author.posts_with_no_comments
+  end
-
-  def test_eager_with_invalid_association_reference
-    assert_raises(ActiveRecord::ConfigurationError, "Association was not found; perhaps you misspelled it?  You specified :include => :monkeys") {

activerecord/test/fixtures/author.rb

@@ -25 +25 @@
-
-  has_many :hello_posts, :class_name => "Post", :conditions => "posts.body = 'hello'"
-  has_many :hello_post_comments, :through => :hello_posts, :source => :comments
+  has_many :posts_with_no_comments, :class_name => 'Post', :conditions => 'comments.id is null', :include => :comments
-
-  has_many :other_posts,          :class_name => "Post"
-  has_many :posts_with_callbacks, :class_name => "Post", :before_add => :log_before_adding,

activerecord/lib/active_record/associations/has_many_association.rb

@@ -138 +138 @@
-          elsif @reflection.options[:counter_sql]
-            @reflection.klass.count_by_sql(@counter_sql)
-          else
-
+, :include => @reflection.options[:include]
-          end
-          
-          @target = [] and loaded if count == 0