mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

removing more calls to deprecated methods

This commit is contained in:
Aaron Patterson 2010-12-02 15:06:43 -08:00
parent ead0c6eed3
commit 8c9b5e413f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
activerecord/lib/active_record/locking/optimistic.rb
View File

@ -87,11 +87,13 @@ module ActiveRecord
begin begin
relation = self.class.unscoped relation = self.class.unscoped
affected_rows = relation.where( stmt = relation.where(
relation.table[self.class.primary_key].eq(quoted_id).and( relation.table[self.class.primary_key].eq(quoted_id).and(
relation.table[lock_col].eq(quote_value(previous_value)) relation.table[lock_col].eq(quote_value(previous_value))
) )
).arel.update(arel_attributes_values(false, false, attribute_names)) ).arel.compile_update(arel_attributes_values(false, false, attribute_names))
affected_rows = connection.update stmt.to_sql
unless affected_rows == 1 unless affected_rows == 1
raise ActiveRecord::StaleObjectError, "Attempted to update a stale object: #{self.class.name}" raise ActiveRecord::StaleObjectError, "Attempted to update a stale object: #{self.class.name}"