diff options
author | Seb Jacobs <me@sebjacobs.com> | 2015-01-15 23:03:23 +0000 |
---|---|---|
committer | Seb Jacobs <me@sebjacobs.com> | 2015-01-16 11:41:43 +0000 |
commit | d5bf649a535948e70692e521ce3070595334e71b (patch) | |
tree | d1f56e9ff058eceba35785bbeb1d88e54e15e910 /activerecord/test/models | |
parent | 090c5211ced7b728df6176d5c9fc7437c107beaf (diff) | |
download | rails-d5bf649a535948e70692e521ce3070595334e71b.tar.gz rails-d5bf649a535948e70692e521ce3070595334e71b.tar.bz2 rails-d5bf649a535948e70692e521ce3070595334e71b.zip |
Add support for bidirectional destroy dependencies
Prior to this commit if you defined a bidirectional relationship
between two models with destroy dependencies on both sides, a call to
`destroy` would result in an infinite callback loop.
Take the following relationship.
class Content < ActiveRecord::Base
has_one :content_position, dependent: :destroy
end
class ContentPosition < ActiveRecord::Base
belongs_to :content, dependent: :destroy
end
Calling `Content#destroy` or `ContentPosition#destroy` would result in
an infinite callback loop.
This commit changes the behaviour of `ActiveRecord::Callbacks#destroy`
so that it guards against subsequent callbacks.
Thanks to @zetter for demonstrating the issue with failing tests[1].
[1] rails#13609
Diffstat (limited to 'activerecord/test/models')
-rw-r--r-- | activerecord/test/models/content.rb | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/activerecord/test/models/content.rb b/activerecord/test/models/content.rb new file mode 100644 index 0000000000..140e1dfc78 --- /dev/null +++ b/activerecord/test/models/content.rb @@ -0,0 +1,40 @@ +class Content < ActiveRecord::Base + self.table_name = 'content' + has_one :content_position, dependent: :destroy + + def self.destroyed_ids + @destroyed_ids ||= [] + end + + before_destroy do |object| + Content.destroyed_ids << object.id + end +end + +class ContentWhichRequiresTwoDestroyCalls < ActiveRecord::Base + self.table_name = 'content' + has_one :content_position, foreign_key: 'content_id', dependent: :destroy + + after_initialize do + @destroy_count = 0 + end + + before_destroy do + @destroy_count += 1 + if @destroy_count == 1 + throw :abort + end + end +end + +class ContentPosition < ActiveRecord::Base + belongs_to :content, dependent: :destroy + + def self.destroyed_ids + @destroyed_ids ||= [] + end + + before_destroy do |object| + ContentPosition.destroyed_ids << object.id + end +end |