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

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