Changeset 8742

Timestamp:

01/27/08 02:41:55 (2 years ago)

Author:

nzkoz

Message:

Make sure count works on has_many :through associations using :group. Closes #10480 [remvee]

Files:

• trunk/activerecord/lib/active_record/associations.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/has_many_through_association.rb (modified) (1 diff)
• trunk/activerecord/test/cases/associations/join_model_test.rb (modified) (1 diff)
• trunk/activerecord/test/models/author.rb (modified) (1 diff)

trunk/activerecord/lib/active_record/associations.rb

@@ -53 +53 @@
-    def initialize(owner, reflection)
-      super("Cannot dissociate new records through '#{owner.class.name}##{reflection.name}' on '#{reflection.source_reflection.class_name rescue nil}##{reflection.source_reflection.name rescue nil}'. Both records must have an id in order to delete the has_many :through record associating them.")
+    end
+  end
+
+  class HasManyThroughCantCountOnColumnForGroupedAssociation < ActiveRecordError #:nodoc:
+    def initialize(owner, reflection, column_name)
+      super("Cannot count on column '#{column_name}' for association '#{owner.class.name}##{reflection.name}' grouped by '#{reflection.options[:group]}'.")
-    end
-  end

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

@@ -125 +125 @@
-          options.merge!(:distinct => true) 
-        end
+
+        if @reflection.options[:group]
+          unless column_name == :all
+            raise HasManyThroughCantCountOnColumnForGroupedAssociation.new(@owner, @reflection, column_name)
+          end
+          column_name = @reflection.options[:group]
+          options.merge!(:distinct => true)
+        end
+
-        @reflection.klass.send(:with_scope, construct_scope) { @reflection.klass.count(column_name, options) } 
-      end

trunk/activerecord/test/cases/associations/join_model_test.rb

@@ -604 +604 @@
-  end
-
+  def test_group_has_many_through_should_use_group_for_count
+    using_length = authors(:david).reload.grouped_comments.length           # all associated comments are read first
+    using_count = authors(:david).reload.grouped_comments.count             # associated comments are only counted
+    assert_equal using_count, using_length
+
+    commented_posts = authors(:david).comments.map(&:post).uniq.size        # count commented posts manually
+    assert_equal commented_posts, authors(:david).grouped_comments.count
+  end
+
+  def test_group_has_many_through_should_not_allow_column_name_for_count
+    assert_raises ActiveRecord::HasManyThroughCantCountOnColumnForGroupedAssociation do
+      authors(:david).grouped_comments.count(:id)
+    end
+  end
+
-  private
-    # create dynamic Post models to allow different dependency options

trunk/activerecord/test/models/author.rb

@@ -21 +21 @@
-  has_many :ordered_uniq_comments, :through => :posts, :source => :comments, :uniq => true, :order => 'comments.id'
-  has_many :ordered_uniq_comments_desc, :through => :posts, :source => :comments, :uniq => true, :order => 'comments.id DESC'
+  has_many :grouped_comments, :through => :posts, :source => :comments, :group => 'comments.post_id'
-
-  has_many :special_posts