Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"

This reverts commit ccd11d5891, reversing
changes made to 54c05acdba.

Reason: This caused a regression when the associated record is created
in a before_create callback. See
https://github.com/rails/rails/pull/12413#issuecomment-25848163
This commit is contained in:
Rafael Mendonça França
2013-10-10 14:41:37 -03:00
parent fbc69ac560
commit 38aefa51c3
4 changed files with 2 additions and 10 deletions

View File

@@ -1,10 +1,4 @@
## unreleased ##
* Move .set_inverse_instance call to association.build_record method. Everytime a new record is build
using the association, we need to try to set the inverse_of relation.
Fixes #10371.
*arthurnn*
* When calling the method .find_or_initialize_by_* from a collection_proxy
it should set the inverse_of relation even when the entry was found on the db.

View File

@@ -240,7 +240,6 @@ module ActiveRecord
skip_assign = [reflection.foreign_key, reflection.type].compact
attributes = create_scope.except(*(record.changed - skip_assign))
record.assign_attributes(attributes, :without_protection => true)
set_inverse_instance(record)
end
end
end

View File

@@ -350,6 +350,7 @@ module ActiveRecord
end
callback(:after_add, record)
set_inverse_instance(record)
record
end

View File

@@ -125,10 +125,8 @@ class InverseHasOneTests < ActiveRecord::TestCase
end
def test_parent_instance_should_be_shared_with_newly_created_child
m = Man.create
m = Man.find(:first)
f = m.create_face(:description => 'haunted')
assert_equal m.object_id, f.man.object_id
assert_not_nil f.man
assert_equal m.name, f.man.name, "Name of man should be the same before changes to parent instance"
m.name = 'Bongo'