From df0765d8dc013ccd399d994109eaf39be4c24e81 Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Sun, 28 Oct 2007 03:39:18 +0000 Subject: Make sure that << works on has_many associations on unsaved records. Closes #9989 [hasmanyjosh] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8049 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/CHANGELOG | 2 ++ .../lib/active_record/associations/association_collection.rb | 1 + activerecord/test/associations_test.rb | 7 +++++++ 3 files changed, 10 insertions(+) (limited to 'activerecord') diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 1875eda3ba..d9b4b8cbf5 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Make sure that << works on has_many associations on unsaved records. Closes #9989 [hasmanyjosh] + * Allow association redefinition in subclasses. #9346 [wildchild] * Fix has_many :through delete with custom foreign keys. #6466 [naffis] diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 5e2e2e0189..79cd227c0c 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -17,6 +17,7 @@ module ActiveRecord # Since << flattens its argument list and inserts each record, +push+ and +concat+ behave identically. def <<(*records) result = true + load_target if @owner.new_record? @owner.transaction do flatten_deeper(records).each do |record| diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb index 1fe8d2a417..842d8e453a 100755 --- a/activerecord/test/associations_test.rb +++ b/activerecord/test/associations_test.rb @@ -103,6 +103,13 @@ class AssociationProxyTest < Test::Unit::TestCase assert david.categories.include?(categories(:technology)) end + def test_push_does_not_lose_additions_to_new_record + josh = Author.new(:name => "Josh") + josh.posts << Post.new(:title => "New on Edge", :body => "More cool stuff!") + assert josh.posts.loaded? + assert_equal 1, josh.posts.size + end + def test_save_on_parent_does_not_load_target david = developers(:david) -- cgit v1.2.3