Browse files

Make #save return true on success, even if locking is enabled (closes #…

…4015) [schoenm@earthlink.net]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3716 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 0fa1278 commit 491554f6dd8b7f63005b5c7c89c01e6b35f69597 @dhh dhh committed Mar 1, 2006
Showing with 16 additions and 16 deletions.
  1. +16 −16 activerecord/lib/active_record/locking.rb
View
32 activerecord/lib/active_record/locking.rb
@@ -30,24 +30,24 @@ def self.append_features(base) #:nodoc:
end
def update_with_lock #:nodoc:
- if locking_enabled?
- lock_col = self.class.locking_column
- previous_value = send(lock_col)
- send(lock_col + '=', previous_value + 1)
-
- affected_rows = connection.update(<<-end_sql, "#{self.class.name} Update with optimistic locking")
- UPDATE #{self.class.table_name}
- SET #{quoted_comma_pair_list(connection, attributes_with_quotes(false))}
- WHERE #{self.class.primary_key} = #{quote(id)}
- AND #{lock_col} = #{quote(previous_value)}
- end_sql
+ return update_without_lock unless locking_enabled?
- unless affected_rows == 1
- raise ActiveRecord::StaleObjectError, "Attempted to update a stale object"
- end
- else
- update_without_lock
+ lock_col = self.class.locking_column
+ previous_value = send(lock_col)
+ send(lock_col + '=', previous_value + 1)
+
+ affected_rows = connection.update(<<-end_sql, "#{self.class.name} Update with optimistic locking")
+ UPDATE #{self.class.table_name}
+ SET #{quoted_comma_pair_list(connection, attributes_with_quotes(false))}
+ WHERE #{self.class.primary_key} = #{quote(id)}
+ AND #{lock_col} = #{quote(previous_value)}
+ end_sql
+
+ unless affected_rows == 1
+ raise ActiveRecord::StaleObjectError, "Attempted to update a stale object"
end
+
+ return true
end
end

0 comments on commit 491554f

Please sign in to comment.