TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Go through normal where logic in destroy with locking

Browse Source 
Building the Arel AST, and manipulating the relation manually like this
is prone to errors and breakage as implementation details change from
underneath it.
This commit is contained in:
Sean Griffin 2015-01-14 15:25:15 -07:00
parent 9a21774d73
commit df73d696f5
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,12 +125,8 @@ def relation_for_destroy
relation = super
if locking_enabled?
column_name = self.class.locking_column
column = self.class.columns_hash[column_name]
substitute = self.class.connection.substitute_at(column)
relation = relation.where(self.class.arel_table[column_name].eq(substitute))
relation.bind_values << [column, self[column_name].to_i]
locking_column = self.class.locking_column
relation = relation.where(locking_column => _read_attribute(locking_column))
end
relation