Changeset 3331

Timestamp:

12/21/05 15:50:31 (3 years ago)

Author:

csshsh

Message:

Fixed that saving a model with multiple habtm associations, would only save the first habtm association.

Files:

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

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed that saving a model with multiple habtm associations, would only save the first habtm association.  #3244 [yanowitz-rubyonrails@quantumfoam.org, Florian Weber]
-
-* Fix change_column to work with PostgreSQL 7.x and 8.x.  #3141 [wejn@box.cz, Rick Olson, Scott Barron] 

trunk/activerecord/lib/active_record/associations.rb

@@ -728 +728 @@
-          method_name = "validate_associated_records_for_#{association_name}".to_sym
-          define_method(method_name) do
-            @new_record_before_save = new_record?
-            association = instance_variable_get("@#{association_name}")
-            if association.respond_to?(:loaded?)
@@ -742 +741 @@
-
-          validate method_name
+          before_save("@new_record_before_save = new_record?; true")
-
-          after_callback = <<-end_eval
@@ -755 +755 @@
-              association.send(:construct_sql)   # reconstruct the SQL queries now that we know the owner's id
-            end
-            
-            @new_record_before_save = false
-            true
-          end_eval
-                

trunk/activerecord/test/associations_test.rb

@@ -1195 +1195 @@
-  end
-
+  def test_habtm_saving_multiple_relationships
+    new_project = Project.new("name" => "Grimetime")
+    amount_of_developers = 4
+    developers = (0..amount_of_developers).collect {|i| Developer.create(:name => "JME #{i}") }
+  
+    new_project.developer_ids = [developers[0].id, developers[1].id]
+    new_project.developers_with_callback_ids = [developers[2].id, developers[3].id]
+    assert new_project.save
+    
+    new_project.reload
+    assert_equal amount_of_developers, new_project.developers.size
+    amount_of_developers.times do |i|
+      assert_equal developers[i].name, new_project.developers[i].name
+    end
+  end
+
-  def test_build
-    devel = Developer.find(1)