Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
40496430
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,发现更多精彩内容 >>
提交
40496430
编写于
10月 22, 2012
作者:
A
Aaron Patterson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
frozen state should be restored after txn is aborted
上级
78adc452
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
2 deletion
+18
-2
activerecord/lib/active_record/transactions.rb
activerecord/lib/active_record/transactions.rb
+3
-2
activerecord/test/cases/transactions_test.rb
activerecord/test/cases/transactions_test.rb
+15
-0
未找到文件。
activerecord/lib/active_record/transactions.rb
浏览文件 @
40496430
...
...
@@ -328,6 +328,7 @@ def remember_transaction_record_state #:nodoc:
@_start_transaction_state
[
:new_record
]
=
@new_record
@_start_transaction_state
[
:destroyed
]
=
@destroyed
@_start_transaction_state
[
:level
]
=
(
@_start_transaction_state
[
:level
]
||
0
)
+
1
@_start_transaction_state
[
:frozen?
]
=
@attributes
.
frozen?
end
# Clear the new record state and id of a record.
...
...
@@ -342,8 +343,8 @@ def restore_transaction_record_state(force = false) #:nodoc:
@_start_transaction_state
[
:level
]
=
(
@_start_transaction_state
[
:level
]
||
0
)
-
1
if
@_start_transaction_state
[
:level
]
<
1
||
force
restore_state
=
@_start_transaction_state
was_frozen
=
@attributes
.
frozen?
@attributes
=
@attributes
.
dup
if
was_frozen
was_frozen
=
restore_state
[
:frozen?
]
@attributes
=
@attributes
.
dup
if
@attributes
.
frozen?
@new_record
=
restore_state
[
:new_record
]
@destroyed
=
restore_state
[
:destroyed
]
if
restore_state
.
has_key?
(
:id
)
...
...
activerecord/test/cases/transactions_test.rb
浏览文件 @
40496430
...
...
@@ -14,6 +14,21 @@ def setup
@first
,
@second
=
Topic
.
find
(
1
,
2
).
sort_by
{
|
t
|
t
.
id
}
end
def
test_raise_after_destroy
refute
@first
.
frozen?
assert_raises
(
RuntimeError
)
{
Topic
.
transaction
do
@first
.
destroy
assert
@first
.
frozen?
raise
end
}
assert
@first
.
reload
refute
@first
.
frozen?
end
def
test_successful
Topic
.
transaction
do
@first
.
approved
=
true
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录