when using a preloaded array and the uniq flag is set then return the…

… size of the uniq array
JonRowe · Mar 15, 2012 · f31670d · f31670d
1 parent fbc9d0f
commit f31670d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
@@ -248,8 +248,12 @@ def destroy(*records)
       # This method is abstract in the sense that it relies on
       # +count_records+, which is a method descendants have to provide.
       def size
-        if !find_target? || (loaded? && !options[:uniq])
-          target.size
+        if !find_target? || loaded?
+          if options[:uniq]
+            target.uniq.size
+          else
+            target.size
+          end
         elsif !loaded? && options[:group]
           load_target.size
         elsif !loaded? && !options[:uniq] && target.is_a?(Array)

diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -338,6 +338,12 @@ def test_uniq_option_prevents_duplicate_push
     assert_equal 3, project.developers.size
   end
 
+  def test_uniq_when_association_already_loaded
+    project = projects(:active_record)
+    project.developers << [ developers(:jamis), developers(:david), developers(:jamis), developers(:david) ]
+    assert_equal 3, Project.includes(:developers).find(project.id).developers.size
+  end
+
   def test_deleting
     david = Developer.find(1)
     active_record = Project.find(1)