aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/locking
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-11-16 14:20:22 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2013-11-16 14:20:22 -0800
commit8d7d2df3e2f9162d892817a4ec2d687b21c2900a (patch)
tree276103dc18d12e99783daf0d7a2b50952c3fae4c /activerecord/lib/active_record/locking
parentc069e0fa342c914901d23b6e9201f1bef168278b (diff)
downloadrails-8d7d2df3e2f9162d892817a4ec2d687b21c2900a.tar.gz
rails-8d7d2df3e2f9162d892817a4ec2d687b21c2900a.tar.bz2
rails-8d7d2df3e2f9162d892817a4ec2d687b21c2900a.zip
pass the pk to compile_update
Diffstat (limited to 'activerecord/lib/active_record/locking')
-rw-r--r--activerecord/lib/active_record/locking/optimistic.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb
index 55776a91c0..6f54729b3c 100644
--- a/activerecord/lib/active_record/locking/optimistic.rb
+++ b/activerecord/lib/active_record/locking/optimistic.rb
@@ -84,7 +84,10 @@ module ActiveRecord
relation.table[self.class.primary_key].eq(id).and(
relation.table[lock_col].eq(self.class.quote_value(previous_lock_value, column_for_attribute(lock_col)))
)
- ).arel.compile_update(arel_attributes_with_values_for_update(attribute_names))
+ ).arel.compile_update(
+ arel_attributes_with_values_for_update(attribute_names),
+ self.class.primary_key
+ )
affected_rows = self.class.connection.update stmt