aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Flores <rodrigo.flores@plataformatec.com.br>2012-04-12 22:12:08 -0300
committerRodrigo Flores <rodrigo.flores@plataformatec.com.br>2012-04-12 22:12:08 -0300
commit944ed4b9606fd44e99cd9fbf79a9a1faad89239c (patch)
tree340e201b31af7f172c082d56ef0fd6385d3f43c2
parent820a677d8622a540188704941a31871ed4d61461 (diff)
downloadrails-944ed4b9606fd44e99cd9fbf79a9a1faad89239c.tar.gz
rails-944ed4b9606fd44e99cd9fbf79a9a1faad89239c.tar.bz2
rails-944ed4b9606fd44e99cd9fbf79a9a1faad89239c.zip
Revert "Added documentation to explain what happens if you don't set any values for the dependent option on has_many"
This reverts commit 820a677d8622a540188704941a31871ed4d61461.
-rw-r--r--activerecord/lib/active_record/associations.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index a4753ad8ac..b901f06ca4 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1097,16 +1097,13 @@ module ActiveRecord
# alongside this object by calling their +destroy+ method. If set to <tt>:delete_all</tt> all associated
# objects are deleted *without* calling their +destroy+ method. If set to <tt>:nullify</tt> all associated
# objects' foreign keys are set to +NULL+ *without* calling their +save+ callbacks. If set to
- # <tt>:restrict</tt> an error will be added to the object, preventing its deletion, if any associated
+ # <tt>:restrict</tt> an error will be added to the object, preventing its deletion, if any associated
# objects are present.
#
# If using with the <tt>:through</tt> option, the association on the join model must be
# a +belongs_to+, and the records which get deleted are the join records, rather than
# the associated records.
#
- # If you don't set any values, all associated objects remain untouched and with an invalid
- # foreign key.
- #
# [:finder_sql]
# Specify a complete SQL statement to fetch the association. This is a good way to go for complex
# associations that depend on multiple tables. May be supplied as a string or a proc where interpolation is
@@ -1385,7 +1382,7 @@ module ActiveRecord
# and +decrement_counter+. The counter cache is incremented when an object of this
# class is created and decremented when it's destroyed. This requires that a column
# named <tt>#{table_name}_count</tt> (such as +comments_count+ for a belonging Comment class)
- # is used on the associate class (such as a Post class) - that is the migration for
+ # is used on the associate class (such as a Post class) - that is the migration for
# <tt>#{table_name}_count</tt> is created on the associate class (such that Post.comments_count will
# return the count cached, see note below). You can also specify a custom counter
# cache column by providing a column name instead of a +true+/+false+ value to this