0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Ensure that save on parent object fails for invalid has_one association. Closes #10518. [Pratik]
0
+
0
 * Remove duplicate code from associations. [Pratik]
0
 
0
 * Refactor HasManyThroughAssociation to inherit from HasManyAssociation. Association callbacks and <association>_ids= now work with hm:t. #11516 [rubyruy]

0
@@ -784,6 +784,7 @@ module ActiveRecord
0
           end
0
           after_save method_name
0
 
0
+          add_single_associated_save_callbacks(reflection.name) 
0
           association_accessor_methods(reflection, HasOneAssociation)
0
           association_constructor_method(:build,  reflection, HasOneAssociation)
0
           association_constructor_method(:create, reflection, HasOneAssociation)
0
@@ -1141,6 +1142,18 @@ module ActiveRecord
0
           end
0
         end
0
         
0
+        def add_single_associated_save_callbacks(association_name)
0
+          method_name = "validate_associated_records_for_#{association_name}".to_sym
0
+          define_method(method_name) do
0
+            association = instance_variable_get("@#{association_name}")
0
+            if !association.nil?
0
+              errors.add "#{association_name}" unless association.target.nil? || association.valid?
0
+            end
0
+          end
0
+        
0
+          validate method_name
0
+        end
0
+        
0
         def add_multiple_associated_save_callbacks(association_name)
0
           method_name = "validate_associated_records_for_#{association_name}".to_sym
0
           ivar = "@#{association_name}"

0
@@ -433,6 +433,18 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
0
     assert_equal a, firm.account
0
     assert_equal a, firm.account(true)
0
   end
0
+  
0
+  def test_save_fails_for_invalid_has_one
0
+    firm = Firm.find(:first)
0
+    assert firm.valid?
0
+    
0
+    firm.account = Account.new
0
+    
0
+    assert !firm.account.valid?
0
+    assert !firm.valid?
0
+    assert !firm.save
0
+    assert_equal "is invalid", firm.errors.on("account")
0
+  end
0
 
0
   def test_assignment_before_either_saved
0
     firm = Firm.new("name" => "GlobalMegaCorp")