diff options
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/persistence.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb index bf17f27e68..052b5d23aa 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -94,7 +94,7 @@ module ActiveRecord relation = self.class.unscoped affected_rows = relation.where( - self.class.primary_key => id, + self.class.primary_key => id_in_database, lock_col => previous_lock_value ).update_all( attributes_for_update(attribute_names).map do |name| diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb index c9f929680b..8f9cb85a90 100644 --- a/activerecord/lib/active_record/persistence.rb +++ b/activerecord/lib/active_record/persistence.rb @@ -691,7 +691,7 @@ module ActiveRecord end def _relation_for_itself - self.class.unscoped.where(self.class.primary_key => id) + self.class.unscoped.where(self.class.primary_key => id_in_database) end def create_or_update(*args, &block) |