Changeset 4618

Timestamp:

07/24/06 04:55:16 (2 years ago)

Author:

rick

Message:

Allow #count through a has_many association to accept :include. [Dan Peterson]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/has_many_association.rb (modified) (1 diff)
• trunk/activerecord/test/associations_go_eager_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Allow #count through a has_many association to accept :include.  [Dan Peterson]
-
-* create_table rdoc: suggest :id => false for habtm join tables. [Zed Shaw]

trunk/activerecord/lib/active_record/associations.rb

@@ -18 +18 @@
-  class HasManyThroughAssociationPolymorphicError < ActiveRecordError #:nodoc:
-    def initialize(owner_class_name, reflection, source_reflection)
-      source_reflection = source_reflection
-      super("Cannot have a has_many :through association '#{owner_class_name}##{reflection.name}' on the polymorphic object '#{source_reflection.class_name}##{source_reflection.name}'.")
-    end

trunk/activerecord/lib/active_record/associations/has_many_association.rb

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

trunk/activerecord/test/associations_go_eager_test.rb

@@ -357 +357 @@
-    assert_equal 2, one.categories.size
-  end
+  
+  def test_count_with_include
+    assert_equal 3, authors(:david).posts_with_comments.count(:conditions => "length(comments.body) > 15")
+  end
-end