diff options
| author | bogdanvlviv <bogdanvlviv@gmail.com> | 2017-03-07 00:09:55 +0200 |
|---|---|---|
| committer | bogdanvlviv <bogdanvlviv@gmail.com> | 2017-03-16 10:42:33 +0200 |
| commit | 5a072ba317aa180b3622145003fb3ed8b93d226f (patch) | |
| tree | ada739f4b8106ca0a6cd5cc214622a241d586a7d /activerecord/lib | |
| parent | f38de5a7b4ea56c8f9f9138248128339a53a1b1f (diff) | |
| download | rails-5a072ba317aa180b3622145003fb3ed8b93d226f.tar.gz rails-5a072ba317aa180b3622145003fb3ed8b93d226f.tar.bz2 rails-5a072ba317aa180b3622145003fb3ed8b93d226f.zip | |
Remove ability update locking_column value
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb index 2659c60f1f..78ce9f8291 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -47,8 +47,6 @@ module ActiveRecord # self.locking_column = :lock_person # end # - # Please note that the optimistic locking will be ignored if you update the - # locking column's value. module Optimistic extend ActiveSupport::Concern @@ -80,13 +78,11 @@ module ActiveRecord def _update_record(attribute_names = self.attribute_names) return super unless locking_enabled? - - lock_col = self.class.locking_column - - return super if attribute_names.include?(lock_col) return 0 if attribute_names.empty? begin + lock_col = self.class.locking_column + previous_lock_value = read_attribute_before_type_cast(lock_col) increment_lock |