aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorsue445 <sue445@sue445.net>2013-10-16 23:55:02 +0900
committersue445 <sue445@sue445.net>2013-10-18 22:01:50 +0900
commita913af96e0e46ca6637bca8f56282608628991eb (patch)
tree08baab6103f8e307112c08391fb92ae18e299a45 /activerecord
parent49bc23f6786261427a8b7856a776afa03e3a5742 (diff)
downloadrails-a913af96e0e46ca6637bca8f56282608628991eb.tar.gz
rails-a913af96e0e46ca6637bca8f56282608628991eb.tar.bz2
rails-a913af96e0e46ca6637bca8f56282608628991eb.zip
[ci skip] avoid deprecation warning in sample code
Account.find(1, lock: true) -> DEPRECATION WARNING: Passing options to #find is deprecated. Please build a scope and then call #find on it.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/locking/pessimistic.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/locking/pessimistic.rb b/activerecord/lib/active_record/locking/pessimistic.rb
index ddf2afca0c..ff7102d35b 100644
--- a/activerecord/lib/active_record/locking/pessimistic.rb
+++ b/activerecord/lib/active_record/locking/pessimistic.rb
@@ -3,12 +3,12 @@ module ActiveRecord
# Locking::Pessimistic provides support for row-level locking using
# SELECT ... FOR UPDATE and other lock types.
#
- # Pass <tt>lock: true</tt> to <tt>ActiveRecord::Base.find</tt> to obtain an exclusive
+ # Chain <tt>ActiveRecord::Base#find</tt> to <tt>ActiveRecord::QueryMethods#lock</tt> to obtain an exclusive
# lock on the selected rows:
# # select * from accounts where id=1 for update
- # Account.find(1, lock: true)
+ # Account.lock.find(1)
#
- # Pass <tt>lock: 'some locking clause'</tt> to give a database-specific locking clause
+ # Call <tt>lock('some locking clause')</tt> to use a database-specific locking clause
# of your own such as 'LOCK IN SHARE MODE' or 'FOR UPDATE NOWAIT'. Example:
#
# Account.transaction do