Fixed AssociationCollection#<< resulting in unexpected values in @target

when :uniq => true Signed-off-by: Michael Koziarski <michael@koziarski.com>
rails · Aug 8, 2008 · 7f6e7ba · 7f6e7ba
1 parent 06e4eb4
commit 7f6e7ba
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb
@@ -344,7 +344,7 @@ def add_record_to_target_with_callbacks(record)
           callback(:before_add, record)
           yield(record) if block_given?
           @target ||= [] unless loaded?
-          @target << record
+          @target << record unless @reflection.options[:uniq] && @target.include?(record)
           callback(:after_add, record)
           record
         end

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
@@ -299,6 +299,17 @@ def test_uniq_before_the_fact
     assert_equal 3, projects(:active_record, :reload).developers.size
   end
 
+  def test_uniq_option_prevents_duplicate_push
+    project = projects(:active_record)
+    project.developers << developers(:jamis)
+    project.developers << developers(:david)
+    assert_equal 3, project.developers.size
+
+    project.developers << developers(:david)
+    project.developers << developers(:jamis)
+    assert_equal 3, project.developers.size
+  end
+
   def test_deleting
     david = Developer.find(1)
     active_record = Project.find(1)