@@ -238,6 +238,8 @@ module ActiveRecord def size if @owner.new_record? || (loaded? && !@reflection.options[:uniq]) @target.size + elsif !loaded? && @reflection.options[:group] + load_target.size elsif !loaded? && !@reflection.options[:uniq] && @target.is_a?(Array) unsaved_records = @target.select { |r| r.new_record? } unsaved_records.size + count_records activerecord/lib/active_record/associations/association_collection.rb @@ -249,7 +249,9 @@ class HasManyAssociationsTest < ActiveRecord::TestCase end def test_find_scoped_grouped + assert_equal 1, companies(:first_firm).clients_grouped_by_firm_id.size assert_equal 1, companies(:first_firm).clients_grouped_by_firm_id.length + assert_equal 2, companies(:first_firm).clients_grouped_by_name.size assert_equal 2, companies(:first_firm).clients_grouped_by_name.length end activerecord/test/cases/associations/has_many_associations_test.rb 157141b2949b845e372ee703bfd6fba3ffb00415 miloops miloops@gmail.com http://github.com/rails/rails/commit/dc8bf7515de85f5bc28d17e96edf4a3e74a858da dc8bf7515de85f5bc28d17e96edf4a3e74a858da 2008-09-15T09:32:05-07:00 2008-09-15T09:23:50-07:00 When counting grouped records the target should be loaded to return a valid groups count result. Without this change count_records will group for the count in the query and return erroneous results. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#937 state:committed] 3bcc577d8a233d6392b1b78c2b14afe928c2e514 Michael Koziarski michael@koziarski.com