Changeset 9232

Timestamp:

04/06/08 02:32:51 (1 month ago)

Author:

pratik

Message:

Ensure that save on parent object fails for invalid has_one association. Closes #10518. [Pratik]

Files:

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

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Ensure that save on parent object fails for invalid has_one association. Closes #10518. [Pratik]
-
-* Remove duplicate code from associations. [Pratik]

trunk/activerecord/lib/active_record/associations.rb

@@ -785 +785 @@
-          after_save method_name
-
+          add_single_associated_save_callbacks(reflection.name) 
-          association_accessor_methods(reflection, HasOneAssociation)
-          association_constructor_method(:build,  reflection, HasOneAssociation)
@@ -1142 +1143 @@
-        end
-        
+        def add_single_associated_save_callbacks(association_name)
+          method_name = "validate_associated_records_for_#{association_name}".to_sym
+          define_method(method_name) do
+            association = instance_variable_get("@#{association_name}")
+            if !association.nil?
+              errors.add "#{association_name}" unless association.target.nil? || association.valid?
+            end
+          end
+        
+          validate method_name
+        end
+        
-        def add_multiple_associated_save_callbacks(association_name)
-          method_name = "validate_associated_records_for_#{association_name}".to_sym

trunk/activerecord/test/cases/associations_test.rb

@@ -434 +434 @@
-    assert_equal a, firm.account(true)
-  end
+  
+  def test_save_fails_for_invalid_has_one
+    firm = Firm.find(:first)
+    assert firm.valid?
+    
+    firm.account = Account.new
+    
+    assert !firm.account.valid?
+    assert !firm.valid?
+    assert !firm.save
+    assert_equal "is invalid", firm.errors.on("account")
+  end
-
-  def test_assignment_before_either_saved