Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
8e5f07da
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8e5f07da
编写于
5月 16, 2012
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5535 from markmcspadden/issue_5527_rollbacks
Allow manual rollbacks in after_save to reset object correctly
上级
8bc1e532
c8792c7b
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
46 addition
and
1 deletion
+46
-1
activerecord/lib/active_record/transactions.rb
activerecord/lib/active_record/transactions.rb
+9
-1
activerecord/test/cases/transaction_callbacks_test.rb
activerecord/test/cases/transaction_callbacks_test.rb
+37
-0
未找到文件。
activerecord/lib/active_record/transactions.rb
浏览文件 @
8e5f07da
...
...
@@ -290,7 +290,15 @@ def with_transaction_returning_status
status
=
nil
self
.
class
.
transaction
do
add_to_transaction
begin
status
=
yield
rescue
ActiveRecord
::
Rollback
if
defined?
(
@_start_transaction_state
)
@_start_transaction_state
[
:level
]
=
(
@_start_transaction_state
[
:level
]
||
0
)
-
1
end
status
=
nil
end
raise
ActiveRecord
::
Rollback
unless
status
end
status
...
...
activerecord/test/cases/transaction_callbacks_test.rb
浏览文件 @
8e5f07da
...
...
@@ -287,8 +287,45 @@ def test_after_rollback_called
raise
ActiveRecord
::
Rollback
end
assert
topic
.
id
.
nil?
assert
!
topic
.
persisted?
assert_equal
%w{ after_rollback }
,
topic
.
history
end
class
TopicWithManualRollbackObserverAttached
<
ActiveRecord
::
Base
self
.
table_name
=
:topics
def
history
@history
||=
[]
end
end
class
TopicWithManualRollbackObserverAttachedObserver
<
ActiveRecord
::
Observer
def
after_save
(
record
)
record
.
history
.
push
"after_save"
raise
ActiveRecord
::
Rollback
end
end
def
test_after_save_called_with_manual_rollback
assert
TopicWithManualRollbackObserverAttachedObserver
.
instance
,
'should have observer'
topic
=
TopicWithManualRollbackObserverAttached
.
new
assert
!
topic
.
save
assert_equal
nil
,
topic
.
id
assert
!
topic
.
persisted?
assert_equal
%w{ after_save }
,
topic
.
history
end
def
test_after_save_called_with_manual_rollback_bang
assert
TopicWithManualRollbackObserverAttachedObserver
.
instance
,
'should have observer'
topic
=
TopicWithManualRollbackObserverAttached
.
new
topic
.
save!
assert_equal
nil
,
topic
.
id
assert
!
topic
.
persisted?
assert_equal
%w{ after_save }
,
topic
.
history
end
end
class
SaveFromAfterCommitBlockTest
<
ActiveRecord
::
TestCase
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录