diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-30 15:16:48 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-30 15:16:48 -0300 |
| commit | e6331b0aa81db3b402f5c1857a0c56c00daf9960 (patch) | |
| tree | 303a63cc4f10dee25c4321c29e99edfafa3f0e13 /activerecord/lib/active_record/locking/optimistic.rb | |
| parent | ce348b9b213f339eaac13d4c86bd3f5648e60ef4 (diff) | |
| parent | eb6cee9cf7fd7c22fe3190e2660eeefdd5ec651f (diff) | |
| download | rails-e6331b0aa81db3b402f5c1857a0c56c00daf9960.tar.gz rails-e6331b0aa81db3b402f5c1857a0c56c00daf9960.tar.bz2 rails-e6331b0aa81db3b402f5c1857a0c56c00daf9960.zip | |
Merge pull request #15427 from sgrif/sg-rename-attribute-ivars
Rename attribute related instance variables to better express intent
Diffstat (limited to 'activerecord/lib/active_record/locking/optimistic.rb')
| -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 4d63b04d9f..7fb27ef6e9 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_record(attribute_names = @attributes.keys) #:nodoc: + def _update_record(attribute_names = @raw_attributes.keys) #:nodoc: return super unless locking_enabled? return 0 if attribute_names.empty? |