diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-11 19:08:16 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-11 19:08:16 -0700 |
| commit | 15184d8b610438d34418342c002b53f441ec647f (patch) | |
| tree | 2b8a504e0c4ce822a3432f56b318113a1e7599aa /activerecord/lib | |
| parent | a513cc1862cc61fd9605352a58c5e36cc40cb574 (diff) | |
| parent | a4801a792a1e47d7f156c6646f662232c46eefa2 (diff) | |
| download | rails-15184d8b610438d34418342c002b53f441ec647f.tar.gz rails-15184d8b610438d34418342c002b53f441ec647f.tar.bz2 rails-15184d8b610438d34418342c002b53f441ec647f.zip | |
Merge pull request #6073 from daveyeu/restore-state-on-record-invalid
Restore state on create when ActiveRecord::RecordInvalid is raised
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/transactions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |