diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-27 14:34:54 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-27 14:34:54 -0300 |
commit | 644719b3952f4b9185803bc242037c996626c5c2 (patch) | |
tree | 4678bf1eac2b61f9224b5300697e5b1252e060a3 /activerecord/lib/active_record/locking | |
parent | 11ac0cad081eb418dfabe8a427332347beb12a0e (diff) | |
parent | ccc1d3dbbec878309ea99839bb8ea2f8aca4dd72 (diff) | |
download | rails-644719b3952f4b9185803bc242037c996626c5c2.tar.gz rails-644719b3952f4b9185803bc242037c996626c5c2.tar.bz2 rails-644719b3952f4b9185803bc242037c996626c5c2.zip |
Merge pull request #15938 from sgrif/sg-stop-instance-execing
Stop using instance exec for type decorators
Diffstat (limited to 'activerecord/lib/active_record/locking')
-rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb index f4ec13a177..52eeb8ae1f 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -53,11 +53,6 @@ module ActiveRecord included do class_attribute :lock_optimistically, instance_writer: false self.lock_optimistically = true - - is_lock_column = ->(name, _) { lock_optimistically && name == locking_column } - decorate_matching_attribute_types(is_lock_column, :_optimistic_locking) do |type| - LockingType.new(type) - end end def locking_enabled? #:nodoc: @@ -167,6 +162,22 @@ module ActiveRecord counters = counters.merge(locking_column => 1) if locking_enabled? super end + + private + + # We need to apply this decorator here, rather than on module inclusion. The closure + # created by the matcher would otherwise evaluate for `ActiveRecord::Base`, not the + # sub class being decorated. As such, changes to `lock_optimistically`, or + # `locking_column` would not be picked up. + def inherited(subclass) + subclass.class_eval do + is_lock_column = ->(name, _) { lock_optimistically && name == locking_column } + decorate_matching_attribute_types(is_lock_column, :_optimistic_locking) do |type| + LockingType.new(type) + end + end + super + end end end |