Changeset 9224

Timestamp:

04/04/08 14:37:22 (8 months ago)

Author:

nzkoz

Message:

Make HABTM#create behave the same as << with after_add callbacks. Closes #11374 [freels]

Files:

• trunk/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb (modified) (2 diffs)
• trunk/activerecord/test/cases/associations/callbacks_test.rb (modified) (1 diff)

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

@@ -149 +149 @@
-
-      private
-
+, &block
-          # Can't use Base.create because the foreign key may be a protected attribute.
-          ensure_owner_is_not_new
@@ -155 +155 @@
-            attributes.collect { |attr| create(attr) }
-          else
-
-
-
+
+
-          end
-        end

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

@@ -95 +95 @@
-  end
-
+  def test_has_and_belongs_to_many_after_add_called_after_save
+    ar = projects(:active_record)
+    assert ar.developers_log.empty?
+    alice = Developer.new(:name => 'alice')
+    ar.developers_with_callbacks << alice
+    assert_equal"after_adding#{alice.id}", ar.developers_log.last
+
+    bob = ar.developers_with_callbacks.create(:name => 'bob')
+    assert_equal "after_adding#{bob.id}", ar.developers_log.last
+
+    ar.developers_with_callbacks.build(:name => 'charlie')
+    assert_equal "after_adding<new>", ar.developers_log.last
+  end
+
+
-  def test_has_and_belongs_to_many_remove_callback
-    david = developers(:david)