Changeset 4379

Timestamp:

05/29/06 03:48:17 (2 years ago)

Author:

rick

Message:

Fix the has_and_belongs_to_many #create doesn't populate the join for new records. Closes #3692 [josh@hasmanythrough.com]

Files:

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

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fix the has_and_belongs_to_many #create doesn't populate the join for new records.  Closes #3692 [josh@hasmanythrough.com]
-
-* Provide Association Extensions access to the instance that the association is being accessed from.  

trunk/activerecord/lib/active_record/associations.rb

@@ -764 +764 @@
-      # * <tt>collection.find(id)</tt> - finds an associated object responding to the +id+ and that
-      #   meets the condition that it has to be associated with this object.
+      # * <tt>collection.build(attributes = {})</tt> - returns a new object of the collection type that has been instantiated
+      #   with +attributes+ and linked to this object through the join table but has not yet been saved.
+      # * <tt>collection.create(attributes = {})</tt> - returns a new object of the collection type that has been instantiated
+      #   with +attributes+ and linked to this object through the join table and that has already been saved (if it passed the validation).
-      #
-      # Example: An Developer class declares <tt>has_and_belongs_to_many :projects</tt>, which will add:
@@ -776 +780 @@
-      # * <tt>Developer#projects.size</tt>
-      # * <tt>Developer#projects.find(id)</tt>
+      # * <tt>Developer#projects.build</tt> (similar to <tt>Project.new("project_id" => id)</tt>)
+      # * <tt>Developer#projects.create</tt> (similar to <tt>c = Project.new("project_id" => id); c.save; c</tt>)
-      # The declaration may include an options hash to specialize the behavior of the association.
-      # 

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

@@ -12 +12 @@
-        @target << record
-        record
+      end
+
+      def create(attributes = {})
+        # Can't use Base.create since the foreign key may be a protected attribute.
+        if attributes.is_a?(Array)
+          attributes.collect { |attr| create(attr) }
+        else
+          record = build(attributes)
+          insert_record(record) unless @owner.new_record?
+          record
+        end
-      end
-

trunk/activerecord/test/associations_test.rb

@@ -1355 +1355 @@
-    assert !proj.new_record?
-    assert_equal devel.projects.last, proj
+    assert_equal Developer.find(1).projects.last, proj  # prove join table is updated
+  end
+  
+  def test_build_by_new_record
+    devel = Developer.new(:name => "Marcel", :salary => 75000)
+    proj1 = devel.projects.build(:name => "Make bed")
+    proj2 = devel.projects.build(:name => "Lie in it")
+    assert_equal devel.projects.last, proj2
+    assert proj2.new_record?
+    devel.save
+    assert !devel.new_record?
+    assert !proj2.new_record?
+    assert_equal devel.projects.last, proj2
+    assert_equal Developer.find_by_name("Marcel").projects.last, proj2  # prove join table is updated
-  end
-  
@@ -1362 +1376 @@
-    assert_equal devel.projects.last, proj
-    assert !proj.new_record?
+    assert_equal Developer.find(1).projects.last, proj  # prove join table is updated
+  end
+  
+  def test_create_by_new_record
+    devel = Developer.new(:name => "Marcel", :salary => 75000)
+    proj1 = devel.projects.create(:name => "Make bed")
+    proj2 = devel.projects.create(:name => "Lie in it")
+    assert_equal devel.projects.last, proj2
+    assert proj2.new_record?
+    devel.save
+    assert !devel.new_record?
+    assert !proj2.new_record?
+    assert_equal devel.projects.last, proj2
+    assert_equal Developer.find_by_name("Marcel").projects.last, proj2  # prove join table is updated
-  end
-