diff options
| author | bogdanvlviv <bogdanvlviv@gmail.com> | 2017-04-29 08:21:05 +0000 |
|---|---|---|
| committer | bogdanvlviv <bogdanvlviv@gmail.com> | 2017-06-20 23:59:05 +0300 |
| commit | f08bc757ebe108df46d76d6fd0029546539f817f (patch) | |
| tree | 1359497c4fe8798416dc51acd96de4456c7b890c /activerecord/lib/active_record/locking | |
| parent | ec8e38943b360312c8db97ca5d1ad4b09eba6683 (diff) | |
| download | rails-f08bc757ebe108df46d76d6fd0029546539f817f.tar.gz rails-f08bc757ebe108df46d76d6fd0029546539f817f.tar.bz2 rails-f08bc757ebe108df46d76d6fd0029546539f817f.zip | |
Fix destroy with locking_column value null
Fix destroying existing object does not work well when optimistic
locking enabled and `locking column` is null in the database.
Follow 22a822e5813ef7ea9ab6dbbb670a363899a083af, #28914
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 f8fcb7ccaa..522da6a571 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -128,7 +128,7 @@ module ActiveRecord if locking_enabled? locking_column = self.class.locking_column - relation = relation.where(locking_column => _read_attribute(locking_column)) + relation = relation.where(locking_column => read_attribute_before_type_cast(locking_column)) end relation |