aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJames Wen <jrw2175@columbia.edu>2015-12-05 02:22:19 -0500
committerJames Wen <jrw2175@columbia.edu>2015-12-05 02:22:19 -0500
commitea5ff2bc98a1b9bf4dffe2fdf99786e60493c9c1 (patch)
tree750179be8c9cd46ee15f921796491788326b62ba /activerecord
parent8bdbf88dfd231f80b8e757b36e77ff72e6b6b83c (diff)
downloadrails-ea5ff2bc98a1b9bf4dffe2fdf99786e60493c9c1.tar.gz
rails-ea5ff2bc98a1b9bf4dffe2fdf99786e60493c9c1.tar.bz2
rails-ea5ff2bc98a1b9bf4dffe2fdf99786e60493c9c1.zip
Clean up and correct documentation for update_columns and update_all [ci skip]
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/persistence.rb1
-rw-r--r--activerecord/lib/active_record/relation.rb5
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index 46c6d8c293..1cb177483a 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -298,6 +298,7 @@ module ActiveRecord
# * \Validations are skipped.
# * \Callbacks are skipped.
# * +updated_at+/+updated_on+ are not updated.
+ # * However, attributes are serialized with the same rules as ActiveRecord::Relation#update_all
#
# This method raises an ActiveRecord::ActiveRecordError when called on new
# objects, or when at least one of the attributes is marked as readonly.
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index f100476374..2cf19c76c5 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -347,9 +347,8 @@ module ActiveRecord
# Updates all records in the current relation with details given. This method constructs a single SQL UPDATE
# statement and sends it straight to the database. It does not instantiate the involved models and it does not
- # trigger Active Record callbacks or validations. Values passed to #update_all will not go through
- # Active Record's type-casting behavior. It should receive only values that can be passed as-is to the SQL
- # database.
+ # trigger Active Record callbacks or validations. However, values passed to #update_all will still go through
+ # Active Record's normal type casting and serialization.
#
# ==== Parameters
#