diff options
| author | Amparo Luna + Guillermo Iguaran <amparo.m.luna@gmail.com+guilleiguaran@gmail.com> | 2013-01-02 11:46:58 -0500 |
|---|---|---|
| committer | Amparo Luna + Guillermo Iguaran <amparo.m.luna@gmail.com+guilleiguaran@gmail.com> | 2013-01-03 11:51:21 -0500 |
| commit | 1f3a1fedf951dbc4b72d178e2a649c4afd2f1566 (patch) | |
| tree | 0bf671d26800e9e95128bb71672e6c52c248a488 /activerecord/lib/active_record/locking | |
| parent | 08db381d15ce37c54bd0f23a6a63eaeda1c1d6f3 (diff) | |
| download | rails-1f3a1fedf951dbc4b72d178e2a649c4afd2f1566.tar.gz rails-1f3a1fedf951dbc4b72d178e2a649c4afd2f1566.tar.bz2 rails-1f3a1fedf951dbc4b72d178e2a649c4afd2f1566.zip | |
Rename update_attributes method to update, keep update_attributes as an alias
Diffstat (limited to 'activerecord/lib/active_record/locking')
| -rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb index 035c77c424..701949e57b 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -66,7 +66,7 @@ module ActiveRecord send(lock_col + '=', previous_lock_value + 1) end - def update(attribute_names = @attributes.keys) #:nodoc: + def update_record(attribute_names = @attributes.keys) #:nodoc: return super unless locking_enabled? return 0 if attribute_names.empty? |