diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-11-02 09:45:17 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-11-02 09:45:17 +0000 |
| commit | ac715b2bcbc1dee525339edec86362261e017bbe (patch) | |
| tree | 4822bf089421a5f68d4b1f9e6fa069a0d8723da9 /activerecord/lib/active_record/associations.rb | |
| parent | eb7964865a5083615503896f7793051491eae23d (diff) | |
| download | rails-ac715b2bcbc1dee525339edec86362261e017bbe.tar.gz rails-ac715b2bcbc1dee525339edec86362261e017bbe.tar.bz2 rails-ac715b2bcbc1dee525339edec86362261e017bbe.zip | |
has_one :dependent => :nullify ignores nil associates. Closes #6528.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5401 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index f40e44e804..8a1b6ca933 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1060,7 +1060,7 @@ module ActiveRecord when :delete module_eval "before_destroy '#{reflection.class_name}.delete(#{reflection.name}.id) unless #{reflection.name}.nil?'" when :nullify - module_eval "before_destroy '#{reflection.name}.update_attribute(\"#{reflection.primary_key_name}\", nil)'" + module_eval "before_destroy '#{reflection.name}.update_attribute(\"#{reflection.primary_key_name}\", nil) unless #{reflection.name}.nil?'" when nil, false # pass else |