Changeset 7327

Timestamp:

08/16/07 04:58:06 (1 year ago)

Author:

nzkoz

Message:

Merge [7235] to stable. References #9167 [danger]

Files:

• branches/1-2-stable/activerecord/CHANGELOG (modified) (1 diff)
• branches/1-2-stable/activerecord/lib/active_record/associations/has_many_association.rb (modified) (1 diff)
• branches/1-2-stable/activerecord/test/associations/eager_test.rb (modified) (1 diff)
• branches/1-2-stable/activerecord/test/fixtures/author.rb (modified) (1 diff)

branches/1-2-stable/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make sure has_many uses :include when counting [danger]
-
-* Save associated records only if the association is already loaded.  #8713 [blaine]

branches/1-2-stable/activerecord/lib/active_record/associations/has_many_association.rb

@@ -139 +139 @@
-            @reflection.klass.count_by_sql(@counter_sql)
-          else
-
+, :include => @reflection.options[:include]
-          end
-          

branches/1-2-stable/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
-

branches/1-2-stable/activerecord/test/fixtures/author.rb

@@ -26 +26 @@
-  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"