Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
633969f1
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,发现更多精彩内容 >>
提交
633969f1
编写于
2月 01, 2016
作者:
J
Jeremy Daer
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #23407 from jeremy/corrupt-before-commit
Fix corrupt transaction state caused by `before_commit` exceptions
上级
b8015669
8fd123f7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
33 addition
and
2 deletion
+33
-2
activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
...active_record/connection_adapters/abstract/transaction.rb
+7
-2
activerecord/test/cases/transaction_callbacks_test.rb
activerecord/test/cases/transaction_callbacks_test.rb
+26
-0
未找到文件。
activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
浏览文件 @
633969f1
...
...
@@ -167,8 +167,13 @@ def begin_transaction(options = {})
def
commit_transaction
transaction
=
@stack
.
last
transaction
.
before_commit_records
@stack
.
pop
begin
transaction
.
before_commit_records
ensure
@stack
.
pop
end
transaction
.
commit
transaction
.
commit_records
end
...
...
activerecord/test/cases/transaction_callbacks_test.rb
浏览文件 @
633969f1
...
...
@@ -34,6 +34,7 @@ class TopicWithCallbacks < ActiveRecord::Base
has_many
:replies
,
class_name:
"ReplyWithCallbacks"
,
foreign_key:
"parent_id"
before_commit
{
|
record
|
record
.
do_before_commit
(
nil
)
}
after_commit
{
|
record
|
record
.
do_after_commit
(
nil
)
}
after_create_commit
{
|
record
|
record
.
do_after_commit
(
:create
)
}
after_update_commit
{
|
record
|
record
.
do_after_commit
(
:update
)
}
...
...
@@ -47,6 +48,12 @@ def history
@history
||=
[]
end
def
before_commit_block
(
on
=
nil
,
&
block
)
@before_commit
||=
{}
@before_commit
[
on
]
||=
[]
@before_commit
[
on
]
<<
block
end
def
after_commit_block
(
on
=
nil
,
&
block
)
@after_commit
||=
{}
@after_commit
[
on
]
||=
[]
...
...
@@ -59,6 +66,11 @@ def after_rollback_block(on = nil, &block)
@after_rollback
[
on
]
<<
block
end
def
do_before_commit
(
on
)
blocks
=
@before_commit
[
on
]
if
defined?
(
@before_commit
)
blocks
.
each
{
|
b
|
b
.
call
(
self
)}
if
blocks
end
def
do_after_commit
(
on
)
blocks
=
@after_commit
[
on
]
if
defined?
(
@after_commit
)
blocks
.
each
{
|
b
|
b
.
call
(
self
)}
if
blocks
...
...
@@ -74,6 +86,20 @@ def setup
@first
=
TopicWithCallbacks
.
find
(
1
)
end
# FIXME: Test behavior, not implementation.
def
test_before_commit_exception_should_pop_transaction_stack
@first
.
before_commit_block
{
raise
'better pop this txn from the stack!'
}
original_txn
=
@first
.
class
.
connection
.
current_transaction
begin
@first
.
save!
fail
rescue
assert_equal
original_txn
,
@first
.
class
.
connection
.
current_transaction
end
end
def
test_call_after_commit_after_transaction_commits
@first
.
after_commit_block
{
|
r
|
r
.
history
<<
:after_commit
}
@first
.
after_rollback_block
{
|
r
|
r
.
history
<<
:after_rollback
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录