diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-06 13:40:21 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-06 13:40:21 +0000 |
| commit | 7267db58906434da54e0f50122b5e8b704b1c953 (patch) | |
| tree | 089ebe97424e2fab2630f629c7a5af1a21d72057 /activerecord/lib/active_record/associations/has_one_association.rb | |
| parent | 838ae35d63c34872d46bee8b006796ebdd9c7722 (diff) | |
| download | rails-7267db58906434da54e0f50122b5e8b704b1c953.tar.gz rails-7267db58906434da54e0f50122b5e8b704b1c953.tar.bz2 rails-7267db58906434da54e0f50122b5e8b704b1c953.zip | |
Added destruction of dependent objects in has_one associations when a new assignment happens #742 [mindel]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@843 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations/has_one_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_one_association.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb index 30704b6f7e..e566089013 100644 --- a/activerecord/lib/active_record/associations/has_one_association.rb +++ b/activerecord/lib/active_record/associations/has_one_association.rb @@ -10,8 +10,13 @@ module ActiveRecord def replace(obj, dont_save = false) load_target unless @target.nil? - @target[@association_class_primary_key_name] = nil - @target.save unless @owner.new_record? + if dependent? && !dont_save + @target.destroy unless @target.new_record? + @owner.clear_association_cache + else + @target[@association_class_primary_key_name] = nil + @target.save unless @owner.new_record? + end end if obj.nil? |