@@ -1,5 +1,7 @@ *SVN* +* Ensure that save on parent object fails for invalid has_one association. Closes #10518. [Pratik] + * Remove duplicate code from associations. [Pratik] * Refactor HasManyThroughAssociation to inherit from HasManyAssociation. Association callbacks and <association>_ids= now work with hm:t. #11516 [rubyruy] activerecord/CHANGELOG @@ -784,6 +784,7 @@ module ActiveRecord end after_save method_name + add_single_associated_save_callbacks(reflection.name) association_accessor_methods(reflection, HasOneAssociation) association_constructor_method(:build, reflection, HasOneAssociation) association_constructor_method(:create, reflection, HasOneAssociation) @@ -1141,6 +1142,18 @@ module ActiveRecord 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/lib/active_record/associations.rb @@ -433,6 +433,18 @@ class HasOneAssociationsTest < ActiveRecord::TestCase 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") activerecord/test/cases/associations_test.rb 9bc75fd007d56d818b8620569410a20aa92c9fc5 Pratik Naik pratiknaik@gmail.com http://github.com/rails/rails/commit/7ddc8f2e1bc9c818b622373a8c85bd679533cefd 7ddc8f2e1bc9c818b622373a8c85bd679533cefd 2008-04-05T19:32:51-07:00 2008-04-05T19:32:51-07:00 Ensure that save on parent object fails for invalid has_one association. Closes #10518. [Pratik] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9232 5ecf4fe2-1ee6-0310-87b1-e25e094e27de 683b5c10891b4e7704404fcf3de81da08f02a54b Pratik Naik pratiknaik@gmail.com