DRYed up Associations#clear. Closes #1906 [Caleb]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2580 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 17 insertions, 0 deletions

diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb
index 932e8e2aae..ced734cfcd 100644
--- a/activerecord/lib/active_record/associations/association_collection.rb
+++ b/activerecord/lib/active_record/associations/association_collection.rb
@@ -33,6 +33,12 @@ module ActiveRecord
 
       alias_method :push, :<<
       alias_method :concat, :<<
+                      
+      # Remove all records from this association
+      def delete_all
+        delete(@target)
+        @target = []
+      end
 
       # Remove +records+ from this association.  Does not destroy +records+.
       def delete(*records)
@@ -50,6 +56,17 @@ module ActiveRecord
           end
         end
       end
+
+      # Removes all records from this association.  Returns +self+ so method calls may be chained.
+      def clear
+        return self if empty? # forces load_target if hasn't happened already
+        if @options[:exclusively_dependent]
+          destroy_all
+        else          
+          delete_all
+        end
+        self
+      end
       
       def destroy_all
         @owner.transaction do