From bb4c6797bf83a7f31b490e3172fd8e17c2c6ca5a Mon Sep 17 00:00:00 2001 From: Florian Weber Date: Mon, 3 Apr 2006 22:37:56 +0000 Subject: Fixed that AssociationCollection#delete_all should work even if the records of the association are not loaded yet. [Florian Weber] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4144 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/CHANGELOG | 2 ++ .../associations/association_collection.rb | 1 + activerecord/test/associations_test.rb | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index ebeb0cf969..9a27b727ea 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that AssociationCollection#delete_all should work even if the records of the association are not loaded yet. [Florian Weber] + * Changed those private ActiveRecord methods to take optional third argument :auto instead of nil for performance optimizations. (closes #4456) [Stefan] * Private ActiveRecord methods add_limit!, add_joins!, and add_conditions! take an OPTIONAL third argument 'scope' (closes #4456) [Rick] diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 8e249d1b94..268452f422 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -37,6 +37,7 @@ module ActiveRecord # Remove all records from this association def delete_all + load_target delete(@target) @target = [] end diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb index b87089b8ec..173808c370 100755 --- a/activerecord/test/associations_test.rb +++ b/activerecord/test/associations_test.rb @@ -550,6 +550,25 @@ class HasManyAssociationsTest < Test::Unit::TestCase assert_equal 0, companies(:first_firm).clients_of_firm.size assert_equal 0, companies(:first_firm).clients_of_firm(true).size end + + def test_delete_all + force_signal37_to_load_all_clients_of_firm + companies(:first_firm).clients_of_firm.create("name" => "Another Client") + assert_equal 2, companies(:first_firm).clients_of_firm.size + companies(:first_firm).clients_of_firm.delete_all + assert_equal 0, companies(:first_firm).clients_of_firm.size + assert_equal 0, companies(:first_firm).clients_of_firm(true).size + end + + def test_delete_all_with_not_yet_loaded_association_collection + force_signal37_to_load_all_clients_of_firm + companies(:first_firm).clients_of_firm.create("name" => "Another Client") + assert_equal 2, companies(:first_firm).clients_of_firm.size + companies(:first_firm).clients_of_firm.reset + companies(:first_firm).clients_of_firm.delete_all + assert_equal 0, companies(:first_firm).clients_of_firm.size + assert_equal 0, companies(:first_firm).clients_of_firm(true).size + end def test_clearing_an_association_collection firm = companies(:first_firm) -- cgit v1.2.3