Merge pull request #13899 from Fortisque/kevin/active_record_HABTM_with_belongs_to

destruction errors out on HABTM w/out primary key
This commit is contained in:
Rafael Mendonça França 2014-02-04 04:11:46 -08:00
commit 702e0e1a6b
2 changed files with 11 additions and 1 deletions

View File

@ -111,7 +111,7 @@ module ActiveRecord
records.each(&:destroy!)
update_counter(-records.length) unless inverse_updates_counter_cache?
else
if records == :all
if records == :all || !reflection.klass.primary_key
scope = self.scope
else
scope = self.scope.where(reflection.klass.primary_key => records)

View File

@ -775,6 +775,16 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
assert project.developers.include?(developer)
end
def test_destruction_does_not_error_without_primary_key
redbeard = pirates(:redbeard)
george = parrots(:george)
redbeard.parrots << george
assert_equal 2, george.pirates.count
Pirate.includes(:parrots).where(parrot: redbeard.parrot).find(redbeard.id).destroy
assert_equal 1, george.pirates.count
assert_equal [], Pirate.where(id: redbeard.id)
end
test "has and belongs to many associations on new records use null relations" do
projects = Developer.new.projects
assert_no_queries do