Changeset 8395

Timestamp:

12/15/07 01:45:30 (1 year ago)

Author:

rick

Message:

Ensure optimistic locking handles nil #lock_version values properly. Closes #10510 [rick]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/locking/optimistic.rb (modified) (1 diff)
• trunk/activerecord/test/locking_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Ensure optimistic locking handles nil #lock_version values properly.  Closes #10510 [rick]
-
-* Make the Fixtures Test::Unit enhancements more supporting for double-loaded test cases.  Closes #10379 [brynary]

trunk/activerecord/lib/active_record/locking/optimistic.rb

@@ -71 +71 @@
-
-          lock_col = self.class.locking_column
-
+.to_i
-          send(lock_col + '=', previous_value + 1)
-

trunk/activerecord/test/locking_test.rb

@@ -65 +65 @@
-    assert_raises(ActiveRecord::StaleObjectError) { p2.save! }
-  end
+  
+  def test_lock_new_with_nil
+    p1 = Person.new(:first_name => 'anika')
+    p1.save!
+    p1.lock_version = nil # simulate bad fixture or column with no default
+    p1.save!
+    assert_equal 1, p1.lock_version
+  end
+    
-
-  def test_lock_column_name_existing