@@ -344,7 +344,7 @@ module ActiveRecord 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 activerecord/lib/active_record/associations/association_collection.rb @@ -299,6 +299,17 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase 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) activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb 06e4eb49eaabde76e38e4f275619fe2df51f1e0a Ernie Miller ernie@metautonomo.us http://github.com/rails/rails/commit/7f6e7ba1f7e8735f1c3f30ba125b5432f00d2a70 7f6e7ba1f7e8735f1c3f30ba125b5432f00d2a70 2008-08-08T06:19:08-07:00 2008-08-02T08:47:05-07:00 Fixed AssociationCollection#<< resulting in unexpected values in @target when :uniq => true Signed-off-by: Michael Koziarski <michael@koziarski.com> 6ef0f774359e80d8c20dd4fd244edab61bd00cec Michael Koziarski michael@koziarski.com