From a4801a792a1e47d7f156c6646f662232c46eefa2 Mon Sep 17 00:00:00 2001 From: Dave Yeu Date: Sun, 29 Apr 2012 22:38:32 -0400 Subject: Restore state on create when ActiveRecord::RecordInvalid is raised This fixes issue #3217. --- activerecord/CHANGELOG.md | 5 +++++ activerecord/lib/active_record/transactions.rb | 2 +- activerecord/test/cases/transactions_test.rb | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index fc3f754b9f..7a549397a0 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -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* diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index 9cb9b4627b..5c3399e2aa 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -327,7 +327,7 @@ module ActiveRecord 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 diff --git a/activerecord/test/cases/transactions_test.rb b/activerecord/test/cases/transactions_test.rb index a9ccd00fac..d5597a68ad 100644 --- a/activerecord/test/cases/transactions_test.rb +++ b/activerecord/test/cases/transactions_test.rb @@ -204,6 +204,23 @@ class TransactionTest < ActiveRecord::TestCase 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 -- cgit v1.2.3