diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 0c7e5c9fd2..55d2212a8a 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Update documentation for :dependent declaration so that it explicitly uses the non-deprecated API. [danger] + * Add documentation caveat about when to use count_by_sql. [fearoffish] * Enhance documentation for increment_counter and decrement_counter. [fearoffish] diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 5393c3f91f..f7c8e1d22f 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -530,7 +530,7 @@ module ActiveRecord # * collection_singular_ids - returns an array of the associated objects ids # * collection_singular_ids=ids - replace the collection by the objects identified by the primary keys in +ids+ # * collection.clear - removes every object from the collection. This destroys the associated objects if they - # are :dependent, deletes them directly from the database if they are :dependent => :delete_all, + # are associated with :dependent => :destroy, deletes them directly from the database if :dependent => :delete_all, # and sets their foreign keys to NULL otherwise. # * collection.empty? - returns true if there are no associated objects. # * collection.size - returns the number of associated objects.