aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/locking
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-03-12 12:02:52 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-03-12 12:02:52 -0700
commit0bb6fcb1d19f95f1ce83616a5cd3167763c51f09 (patch)
tree8d47bb310df6638519d18fe909d19c0c51a877df /activerecord/lib/active_record/locking
parent0210c44cd31ac4711e8d510c418fb325e3f44fa9 (diff)
parenta02d237518c401c6b85d7b1f36b56990753c6605 (diff)
downloadrails-0bb6fcb1d19f95f1ce83616a5cd3167763c51f09.tar.gz
rails-0bb6fcb1d19f95f1ce83616a5cd3167763c51f09.tar.bz2
rails-0bb6fcb1d19f95f1ce83616a5cd3167763c51f09.zip
Merge pull request #5294 from robinroestenburg/master
Refactoring of `arel_attributes_values` method
Diffstat (limited to 'activerecord/lib/active_record/locking')
-rw-r--r--activerecord/lib/active_record/locking/optimistic.rb2
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 9b2dc096a0..8266427b71 100644
--- a/activerecord/lib/active_record/locking/optimistic.rb
+++ b/activerecord/lib/active_record/locking/optimistic.rb
@@ -84,7 +84,7 @@ module ActiveRecord
relation.table[self.class.primary_key].eq(id).and(
relation.table[lock_col].eq(quote_value(previous_lock_value))
)
- ).arel.compile_update(arel_attributes_values(false, false, attribute_names))
+ ).arel.compile_update(arel_attributes_with_values_for_update(attribute_names))
affected_rows = connection.update stmt