Ticket #10518: updated_invalid_has_one_patch.patch

activerecord/lib/active_record/associations.rb

@@ -783 +783 @@
-            end
-          end
-          after_save method_name
-
+
-          association_accessor_methods(reflection, HasOneAssociation)
-          association_constructor_method(:build,  reflection, HasOneAssociation)
-          association_constructor_method(:create, reflection, HasOneAssociation)
@@ -1141 +1141 @@
-          end
-        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
-          ivar = "@#{association_name}"

activerecord/test/cases/associations_test.rb

@@ -433 +433 @@
-    assert_equal a, firm.account
-    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
-    firm = Firm.new("name" => "GlobalMegaCorp")