diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-19 22:52:08 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-19 22:52:08 +0530 |
| commit | dbce07b81d24a991ddd29b91f9c358b1f236bda2 (patch) | |
| tree | d2d3e5f5ebce075311fa1ab22e7749e7549879c7 /activerecord/lib/active_record/locking | |
| parent | 9465b84b543ae1ada29c0e39e34f919c724eab6d (diff) | |
| download | rails-dbce07b81d24a991ddd29b91f9c358b1f236bda2.tar.gz rails-dbce07b81d24a991ddd29b91f9c358b1f236bda2.tar.bz2 rails-dbce07b81d24a991ddd29b91f9c358b1f236bda2.zip | |
Give preference to to_a over arel from Relation#method_missing
Diffstat (limited to 'activerecord/lib/active_record/locking')
| -rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 4 |
1 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 9fcdabdb44..bf0683eb8f 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -81,8 +81,8 @@ module ActiveRecord relation = self.class.unscoped affected_rows = relation.where( - relation[self.class.primary_key].eq(quoted_id).and( - relation[self.class.locking_column].eq(quote_value(previous_value)) + relation.table[self.class.primary_key].eq(quoted_id).and( + relation.table[self.class.locking_column].eq(quote_value(previous_value)) ) ).update(arel_attributes_values(false, false, attribute_names)) |