Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix association writer with :dependent => :nullify. Closes #7314.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7477 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 498d8ff72eded86fb1064205332e0a91b1dacece 1 parent 12f8f89
@jeremy jeremy authored
View
2  activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix association writer with :dependent => :nullify. #7314 [Jonathan Viney]
+
* OpenBase: update for new lib and latest Rails. Support migrations. #8748 [dcsesq]
* Moved acts_as_tree into a plugin of the same name on the official Rails svn #9514 [lifofifo]
View
19 activerecord/lib/active_record/associations/has_many_association.rb
@@ -125,14 +125,17 @@ def insert_record(record)
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
View
5 activerecord/test/associations_test.rb
@@ -961,6 +961,11 @@ def test_replace_with_less
assert_equal 1, firm.clients.length
end
+ def test_replace_with_less_and_dependent_nullify
+ num_companies = Company.count
+ companies(:rails_core).companies = []
+ assert_equal num_companies, Company.count
+ end
def test_replace_with_new
firm = Firm.find(:first)
Please sign in to comment.
Something went wrong with that request. Please try again.