Permalink
Browse files

Includes stale record in StaleObjectError

  • Loading branch information...
1 parent 401d00d commit 410fa4cf7c710ff062c59c1c90357729c418be65 @fabrik42 fabrik42 committed Oct 14, 2011
@@ -99,6 +99,15 @@ class PreparedStatementInvalid < ActiveRecordError
#
# Read more about optimistic locking in ActiveRecord::Locking module RDoc.
class StaleObjectError < ActiveRecordError
+ attr_reader :record
+
+ def initialize(record)
+ @record = record
+ end
+
+ def message
+ "Attempted to update a stale object: #{record.class.name}"
+ end
end
# Raised when association is being configured improperly or
@@ -103,7 +103,7 @@ def update(attribute_names = @attributes.keys) #:nodoc:
affected_rows = connection.update stmt
unless affected_rows == 1
- raise ActiveRecord::StaleObjectError, "Attempted to update a stale object: #{self.class.name}"
+ raise ActiveRecord::StaleObjectError, self
end
affected_rows
@@ -127,7 +127,7 @@ def destroy #:nodoc:
affected_rows = self.class.unscoped.where(predicate).delete_all
unless affected_rows == 1
- raise ActiveRecord::StaleObjectError, "Attempted to delete a stale object: #{self.class.name}"
+ raise ActiveRecord::StaleObjectError, self
end
end
@@ -125,6 +125,24 @@ def test_lock_new
assert_raise(ActiveRecord::StaleObjectError) { p2.save! }
end
+ def test_lock_exception_record
+ p1 = Person.new(:first_name => 'mira')
+ assert_equal 0, p1.lock_version
+
+ p1.first_name = 'mira2'
+ p1.save!
+ p2 = Person.find(p1.id)
+ assert_equal 0, p1.lock_version
+ assert_equal 0, p2.lock_version
+
+ p1.first_name = 'mira3'
+ p1.save!
+
+ p2.first_name = 'sue'
+ error = assert_raise(ActiveRecord::StaleObjectError) { p2.save! }
+ assert_equal(error.record.object_id, p2.object_id)
+ end
+
def test_lock_new_with_nil
p1 = Person.new(:first_name => 'anika')
p1.save!
@@ -141,7 +159,6 @@ def test_touch_existing_lock
assert_equal 1, p1.lock_version
end
-
def test_lock_column_name_existing
t1 = LegacyThing.find(1)
t2 = LegacyThing.find(1)

0 comments on commit 410fa4c

Please sign in to comment.