diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-03-17 11:28:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 11:28:50 -0400 |
| commit | 3666962dd031b2d0e028f4fc6b52e0f19d573798 (patch) | |
| tree | 8bca3ae6a2beb369f2f8e439cddbcb4d81cee277 /activerecord/lib | |
| parent | 73b86ac58b61b4c7b888962252a1a86dffb24081 (diff) | |
| parent | 5a072ba317aa180b3622145003fb3ed8b93d226f (diff) | |
| download | rails-3666962dd031b2d0e028f4fc6b52e0f19d573798.tar.gz rails-3666962dd031b2d0e028f4fc6b52e0f19d573798.tar.bz2 rails-3666962dd031b2d0e028f4fc6b52e0f19d573798.zip | |
Merge pull request #28318 from bogdanvlviv/remove-ability-update-locking_column-value
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 |