Changeset 4958

Timestamp:

09/04/06 00:02:38 (2 years ago)

Author:

bitsweat

Message:

Optimistic locking: gracefully handle nil versions, treat as zero. Closes #5908.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/locking/optimistic.rb (modified) (2 diffs)
• trunk/activerecord/test/fixtures/db_definitions/schema.rb (modified) (1 diff)
• trunk/activerecord/test/locking_test.rb (modified) (2 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Optimistic locking: gracefully handle nil versions, treat as zero.  #5908 [Tom Ward]
-
-* validates_confirmation_of only kicks in when the attribute, rather than its confirmation, is present.  #785 [z@wzph.com]

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

@@ -31 +31 @@
-
-        base.alias_method_chain :update, :lock
+        base.alias_method_chain :attributes_from_column_definition, :lock
+        
-        class << base
-          alias_method :locking_column=, :set_locking_column
@@ -38 +40 @@
-      def locking_enabled? #:nodoc:
-        lock_optimistically && respond_to?(self.class.locking_column)
+      end
+
+      def attributes_from_column_definition_with_lock
+        result = attributes_from_column_definition_without_lock
+        
+        # If the locking column has no default value set,
+        # start the lock version at zero.  Note we can't use
+        # locking_enabled? at this point as @attributes may
+        # not have been initialized yet
+        
+        if lock_optimistically && result.include?(self.class.locking_column)
+          result[self.class.locking_column] ||= 0
+        end
+        
+        return result
-      end
-

trunk/activerecord/test/fixtures/db_definitions/schema.rb

@@ -50 +50 @@
-  end
-  add_index :edges, [:source_id, :sink_id], :unique => true, :name => 'unique_edge_index'
+
+  create_table :lock_without_defaults, :force => true do |t|
+    t.column :lock_version, :integer
+  end
+  
+  create_table :lock_with_custom_column_without_defaults, :force => true do |t|
+    t.column :custom_lock_version, :integer
+  end
-end

trunk/activerecord/test/locking_test.rb

@@ -2 +2 @@
-require 'fixtures/person'
-require 'fixtures/legacy_thing'
+
+class LockWithoutDefault < ActiveRecord::Base; end
+
+class LockWithCustomColumnWithoutDefault < ActiveRecord::Base
+  set_locking_column :custom_lock_version
+end
-
-class OptimisticLockingTest < Test::Unit::TestCase
@@ -56 +62 @@
-    assert_equal 1, p1.lock_version
-    assert_equal p1.lock_version, Person.new(p1.attributes).lock_version
+  end
+  
+  def test_lock_without_default_sets_version_to_zero
+    t1 = LockWithoutDefault.new
+    assert_equal 0, t1.lock_version
+  end
+  
+  def test_lock_with_custom_column_without_default_sets_version_to_zero
+    t1 = LockWithCustomColumnWithoutDefault.new
+    assert_equal 0, t1.custom_lock_version
-  end
-end