mirror of
https://github.com/github/rails.git
synced 2026-01-09 14:48:01 -05:00
Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"
This reverts commitccd11d5891, reversing changes made to54c05acdba. 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:
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -350,6 +350,7 @@ module ActiveRecord
|
||||
end
|
||||
|
||||
callback(:after_add, record)
|
||||
set_inverse_instance(record)
|
||||
|
||||
record
|
||||
end
|
||||
|
||||
@@ -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'
|
||||
|
||||
Reference in New Issue
Block a user