Skip to content

Commit

Permalink
Fix collection= on hm:t join models when unsaved
Browse files Browse the repository at this point in the history
If assigning to a has_many :through collection against an unsaved
object using the collection=[<array_of_items>] syntax, the join models
were not properly created, previously.
  • Loading branch information
ernie committed Sep 17, 2012
1 parent 82efe89 commit 610b632
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 0 deletions.
5 changes: 5 additions & 0 deletions activerecord/CHANGELOG.md
@@ -1,5 +1,10 @@
## Rails 4.0.0 (unreleased) ##

* Fix creation of through association models when using collection=[]
on a hm:t association from an unsaved model.

*Ernie Miller*

* Explain only normal CRUD sql (select / update / insert / delete).
Fix problem that explains unexplainable sql. Closes #7544 #6458.

Expand Down
Expand Up @@ -37,6 +37,20 @@ def concat(*records)
super
end

def concat_records(records)
ensure_not_nested

records = super

if owner.new_record? && records
records.flatten.each do |record|
build_through_record(record)
end
end

records
end

def insert_record(record, validate = true, raise = false)
ensure_not_nested

Expand Down
Expand Up @@ -838,6 +838,11 @@ def test_save_should_not_raise_exception_when_join_record_has_errors
end
end

def test_assign_array_to_new_record_builds_join_records
c = Category.new(:name => 'Fishing', :authors => [Author.first])
assert_equal 1, c.categorizations.size
end

def test_create_bang_should_raise_exception_when_join_record_has_errors
repair_validations(Categorization) do
Categorization.validate { |r| r.errors[:base] << 'Invalid Categorization' }
Expand Down

0 comments on commit 610b632

Please sign in to comment.