diff options
| author | Paul Nikitochkin <paul.nikitochkin@gmail.com> | 2013-07-08 12:31:07 +0300 |
|---|---|---|
| committer | Paul Nikitochkin <paul.nikitochkin@gmail.com> | 2013-07-14 20:35:31 +0300 |
| commit | e0d59e6219c752d8cffc6b78c2240755f5728922 (patch) | |
| tree | ee900eaf247547a9596eaf44eee5ea28b96a0584 /activerecord/CHANGELOG.md | |
| parent | 9fbdd9d83e8e2775845cbc581e0c357f99d292e4 (diff) | |
| download | rails-e0d59e6219c752d8cffc6b78c2240755f5728922.tar.gz rails-e0d59e6219c752d8cffc6b78c2240755f5728922.tar.bz2 rails-e0d59e6219c752d8cffc6b78c2240755f5728922.zip | |
#4566: Remove extra decrement of transaction level
`rollback_active_record_state!` tries to restore model state on `Exception`
by invoking `restore_transaction_record_state` it decrement deep level by `1`.
After restoring it ensure that states to be cleared
and level decremented by invoking `clear_transaction_record_state`,
which cause the bug: because state already reduced in `restore_transaction_record_state`.
Removed double derement of transaction level
and removed duplicated code which clear transaction state for top level.
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 404443f4ad..624c26e759 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,9 @@ +* Remove extra decrement of transaction deep level. + + Fixes: #4566 + + *Paul Nikitochkin* + * Reset @column_defaults when assigning `locking_column`. We had a potential problem. For example: |