lock_optimistically is typically true, so evaluate the common failure…

… case first
rails · Jun 28, 2011 · 13e79eb · 13e79eb
1 parent 02f45d6
commit 13e79eb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb
@@ -73,7 +73,7 @@ def attributes_from_column_definition
           # <tt>locking_enabled?</tt> at this point as 
           # <tt>@attributes</tt> may not have been initialized yet.
 
-          if lock_optimistically && result.include?(self.class.locking_column)
+          if result.key?(self.class.locking_column) && lock_optimistically
             result[self.class.locking_column] ||= 0
           end