aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-03-01 05:43:50 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-03-01 05:43:50 +0000
commit491554f6dd8b7f63005b5c7c89c01e6b35f69597 (patch)
tree8da60e234856a198af5a10ead4522f81ff0bde8e /activerecord
parent0fa127870ca55dda1791f2a28490defc5569702c (diff)
downloadrails-491554f6dd8b7f63005b5c7c89c01e6b35f69597.tar.gz
rails-491554f6dd8b7f63005b5c7c89c01e6b35f69597.tar.bz2
rails-491554f6dd8b7f63005b5c7c89c01e6b35f69597.zip
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
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/locking.rb32
1 files changed, 16 insertions, 16 deletions
diff --git a/activerecord/lib/active_record/locking.rb b/activerecord/lib/active_record/locking.rb
index 28d55da6df..1f8706829d 100644
--- a/activerecord/lib/active_record/locking.rb
+++ b/activerecord/lib/active_record/locking.rb
@@ -30,24 +30,24 @@ module ActiveRecord
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