Ticket #3692: habtm_create_patch.diff

activerecord/test/associations_test.rb

@@ -1354 +1354 @@
-    devel.save
-    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
+  
-  def test_create
-    devel = Developer.find(1)
-    proj = devel.projects.create("name" => "Projekt")
-    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
+  
-  def test_uniq_after_the_fact
-    developers(:jamis).projects << projects(:active_record)
-    developers(:jamis).projects << projects(:active_record)

activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb

@@ -13 +13 @@
-        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
+
-      def find_first
-        load_target.first
-      end

activerecord/lib/active_record/associations.rb

@@ -763 +763 @@
-      # * <tt>collection.size</tt> - returns the number of associated objects.
-      # * <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:
-      # * <tt>Developer#projects</tt>
@@ -775 +779 @@
-      # * <tt>Developer#projects.empty?</tt>
-      # * <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.
-      # 
-      # Options are: