diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-09-14 07:29:22 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-09-14 07:29:22 +0000 |
| commit | 498d8ff72eded86fb1064205332e0a91b1dacece (patch) | |
| tree | 6e7c90e4eeb6c1a2dc46ac6b6e26e8e1509e4bd5 /activerecord/lib/active_record/associations/has_many_association.rb | |
| parent | 12f8f8930794b2ae56630e846300c3aff0a7a58e (diff) | |
| download | rails-498d8ff72eded86fb1064205332e0a91b1dacece.tar.gz rails-498d8ff72eded86fb1064205332e0a91b1dacece.tar.bz2 rails-498d8ff72eded86fb1064205332e0a91b1dacece.zip | |
Fix association writer with :dependent => :nullify. Closes #7314.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7477 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations/has_many_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index d385691967..d07d460b0a 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -125,14 +125,17 @@ module ActiveRecord end def delete_records(records) - if @reflection.options[:dependent] - records.each { |r| r.destroy } - else - ids = quoted_record_ids(records) - @reflection.klass.update_all( - "#{@reflection.primary_key_name} = NULL", - "#{@reflection.primary_key_name} = #{@owner.quoted_id} AND #{@reflection.klass.primary_key} IN (#{ids})" - ) + case @reflection.options[:dependent] + when :destroy + records.each(&:destroy) + when :delete_all + @reflection.klass.delete(records.map(&:id)) + else + ids = quoted_record_ids(records) + @reflection.klass.update_all( + "#{@reflection.primary_key_name} = NULL", + "#{@reflection.primary_key_name} = #{@owner.quoted_id} AND #{@reflection.klass.primary_key} IN (#{ids})" + ) end end |