From 018e12da312a1ac35f23cf32155b61e21362fca4 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 3 Jul 2005 08:32:02 +0000 Subject: r1605@asus: jeremy | 2005-07-02 14:50:23 -0700 And take it out again.. passing around the quoter doesn't make sense any more because we're calling quote_column_name, not the generic quote method. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1624 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/locking.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/locking.rb b/activerecord/lib/active_record/locking.rb index 90aba3913c..c8868bed3c 100644 --- a/activerecord/lib/active_record/locking.rb +++ b/activerecord/lib/active_record/locking.rb @@ -32,14 +32,15 @@ module ActiveRecord previous_value = self.lock_version self.lock_version = previous_value + 1 - affected_rows = connection.update( - "UPDATE #{self.class.table_name} "+ - "SET #{quoted_comma_pair_list(connection, attributes_with_quotes(false))} " + - "WHERE #{self.class.primary_key} = #{quote(id)} AND lock_version = #{quote(previous_value)}", - "#{self.class.name} Update with optimistic locking" - ) - - raise(ActiveRecord::StaleObjectError, "Attempted to update a stale object") unless affected_rows == 1 + affected_rows = connection.update(<<-end_sql, "#{self.class.name} Update with optimistic locking") + UPDATE #{self.class.table_name} + SET #{quoted_comma_pair_list(attributes_with_quotes(false))} + WHERE #{self.class.primary_key} = #{quote(id)} AND lock_version = #{quote(previous_value)} + end_sql + + unless affected_rows == 1 + raise ActiveRecord::StaleObjectError, "Attempted to update a stale object" + end else update_without_lock end -- cgit v1.2.3