Permalink
Browse files

Merge pull request #6073 from daveyeu/restore-state-on-record-invalid

Restore state on create when ActiveRecord::RecordInvalid is raised
  • Loading branch information...
2 parents a513cc1 + a4801a7 commit 15184d8b610438d34418342c002b53f441ec647f @rafaelfranca rafaelfranca committed Aug 12, 2012
@@ -1,5 +1,10 @@
## Rails 4.0.0 (unreleased) ##
+* Fix AR#create to return an unsaved record when AR::RecordInvalid is
+ raised. Fixes #3217.
+
+ *Dave Yeu*
+
* Fixed table name prefix that is generated in engines for namespaced models
*Wojciech Wnętrzak*
@@ -327,7 +327,7 @@ def clear_transaction_record_state #:nodoc:
def restore_transaction_record_state(force = false) #:nodoc:
if defined?(@_start_transaction_state)
@_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) - 1
- if @_start_transaction_state[:level] < 1
+ if @_start_transaction_state[:level] < 1 || force
restore_state = remove_instance_variable(:@_start_transaction_state)
was_frozen = @attributes.frozen?
@attributes = @attributes.dup if was_frozen
@@ -204,6 +204,23 @@ def test_callback_rollback_in_create
end
end
+ def test_callback_rollback_in_create_with_record_invalid_exception
+ begin
+ Topic.class_eval <<-eoruby, __FILE__, __LINE__ + 1
+ remove_method(:after_create_for_transaction)
+ def after_create_for_transaction
+ raise ActiveRecord::RecordInvalid.new(Author.new)
+ end
+ eoruby
+
+ new_topic = Topic.create(:title => "A new topic")
+ assert !new_topic.persisted?, "The topic should not be persisted"
+ assert_nil new_topic.id, "The topic should not have an ID"
+ ensure
+ remove_exception_raising_after_create_callback_to_topic
+ end
+ end
+
def test_nested_explicit_transactions
Topic.transaction do
Topic.transaction do

0 comments on commit 15184d8

Please sign in to comment.