diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-05-08 18:53:12 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-05-08 18:53:12 +0100 |
| commit | a8daea4b85b2709600d5e894b7380149b0854b53 (patch) | |
| tree | 6db7a372616d0299d840bb632dfe132e730d919d /activerecord/lib/active_record | |
| parent | a45f300e5f2d6b6581dd0f0d0f650c83b9773170 (diff) | |
| parent | 4fbd8adf4824d48aea47a57047d90fb6510cee28 (diff) | |
| download | rails-a8daea4b85b2709600d5e894b7380149b0854b53.tar.gz rails-a8daea4b85b2709600d5e894b7380149b0854b53.tar.bz2 rails-a8daea4b85b2709600d5e894b7380149b0854b53.zip | |
Merge pull request #332 from cmeiklejohn/bug6230_optimistic_locking_double_quoted
Diffstat (limited to 'activerecord/lib/active_record')
| -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 9a31675782..cdedcde0eb 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 stmt = relation.where( - relation.table[self.class.primary_key].eq(quoted_id).and( + 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)) |