Changeset 7328

Timestamp:

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

Author:

nzkoz

Message:

Don't clobber :includes passed to count on has_many association. Closes #9175 [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/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Don't clobber includes passed to has_many.count [danger]
-
-* Make sure has_many uses :include when counting [danger]

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

@@ -51 +51 @@
-            @finder_sql :
-            @finder_sql + " AND (#{sanitize_sql(options[:conditions])})"
-
+||
-
-          @reflection.klass.count(column_name, options)

branches/1-2-stable/activerecord/test/associations/eager_test.rb

@@ -168 +168 @@
-    posts = Post.find(:all, :include => [ :author, :comments ], :limit => 2, :conditions => "posts.title = 'magic forest'")
-    assert_equal 0, posts.size
+  end
+  
+  def test_eager_count_performed_on_a_has_many_association_with_multi_table_conditional
+    author = authors(:david)
+    author_posts_without_comments = author.posts.select { |post| post.comments.blank? }
+    assert_equal author_posts_without_comments.size, author.posts.count(:all, :include => :comments, :conditions => 'comments.id is null')
-  end
-