Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
88882964
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,发现更多精彩内容 >>
提交
88882964
编写于
7月 31, 2014
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #16341 from arthurnn/transactions_remove_begin
Transactions refactoring - 2
上级
ed9b23d8
41407979
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
56 deletion
+20
-56
activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
...active_record/connection_adapters/abstract/transaction.rb
+18
-54
activerecord/test/cases/transactions_test.rb
activerecord/test/cases/transactions_test.rb
+2
-2
未找到文件。
activerecord/lib/active_record/connection_adapters/abstract/transaction.rb
浏览文件 @
88882964
...
...
@@ -8,7 +8,7 @@ def initialize(connection)
def
begin_transaction
(
options
=
{})
transaction_class
=
@stack
.
empty?
?
RealTransaction
:
SavepointTransaction
transaction
=
transaction_class
.
new
(
@connection
,
current_transaction
,
options
)
transaction
=
transaction_class
.
new
(
@connection
,
"active_record_
#{
@stack
.
size
}
"
,
options
)
@stack
.
push
(
transaction
)
transaction
...
...
@@ -50,22 +50,18 @@ def current_transaction
private
def
closed_transaction
@closed_transaction
||=
ClosedTransaction
.
new
(
@connection
)
@closed_transaction
||=
ClosedTransaction
.
new
end
end
class
Transaction
#:nodoc:
attr_reader
:connection
attr_reader
:connection
,
:state
def
initialize
(
connection
)
@connection
=
connection
@state
=
TransactionState
.
new
end
def
state
@state
end
def
savepoint_name
nil
end
...
...
@@ -102,64 +98,35 @@ def set_state(state)
end
class
ClosedTransaction
<
Transaction
#:nodoc:
def
number
0
end
def
begin
(
options
=
{})
RealTransaction
.
new
(
connection
,
self
,
options
)
end
def
closed?
true
end
def
open?
false
end
def
joinable?
false
end
def
initialize
;
super
(
nil
);
end
def
closed?
;
true
;
end
def
open?
;
false
;
end
def
joinable?
;
false
;
end
# This is a noop when there are no open transactions
def
add_record
(
record
)
end
def
add_record
(
record
);
end
end
class
OpenTransaction
<
Transaction
#:nodoc:
attr_reader
:
parent
,
:
records
attr_reader
:records
attr_writer
:joinable
def
initialize
(
connection
,
parent
,
options
=
{})
def
initialize
(
connection
,
options
=
{})
super
connection
@parent
=
parent
@records
=
[]
@joinable
=
options
.
fetch
(
:joinable
,
true
)
end
def
joinable?
@joinable
end
def
number
parent
.
number
+
1
end
def
begin
(
options
=
{})
SavepointTransaction
.
new
(
connection
,
self
,
options
)
end
def
rollback
perform_rollback
parent
end
def
commit
perform_commit
parent
end
def
add_record
(
record
)
...
...
@@ -174,7 +141,7 @@ def rollback_records
@state
.
set_state
(
:rolledback
)
records
.
uniq
.
each
do
|
record
|
begin
record
.
rolledback!
(
parent
.
closed?
)
record
.
rolledback!
(
self
.
is_a?
(
RealTransaction
)
)
rescue
=>
e
record
.
logger
.
error
(
e
)
if
record
.
respond_to?
(
:logger
)
&&
record
.
logger
end
...
...
@@ -202,8 +169,8 @@ def open?
end
class
RealTransaction
<
OpenTransaction
#:nodoc:
def
initialize
(
connection
,
parent
,
options
=
{})
super
def
initialize
(
connection
,
_
,
options
=
{})
super
(
connection
,
options
)
if
options
[
:isolation
]
connection
.
begin_isolated_db_transaction
(
options
[
:isolation
])
...
...
@@ -226,26 +193,23 @@ def perform_commit
class
SavepointTransaction
<
OpenTransaction
#:nodoc:
attr_reader
:savepoint_name
def
initialize
(
connection
,
parent
,
options
=
{})
def
initialize
(
connection
,
savepoint_name
,
options
=
{})
if
options
[
:isolation
]
raise
ActiveRecord
::
TransactionIsolationError
,
"cannot set transaction isolation in a nested transaction"
end
super
# Savepoint name only counts the Savepoint transactions, so we need to subtract 1
@savepoint_name
=
"active_record_
#{
number
-
1
}
"
connection
.
create_savepoint
(
@savepoint_name
)
super
(
connection
,
options
)
connection
.
create_savepoint
(
@savepoint_name
=
savepoint_name
)
end
def
perform_rollback
connection
.
rollback_to_savepoint
(
@
savepoint_name
)
connection
.
rollback_to_savepoint
(
savepoint_name
)
rollback_records
end
def
perform_commit
@state
.
set_state
(
:committed
)
connection
.
release_savepoint
(
@
savepoint_name
)
connection
.
release_savepoint
(
savepoint_name
)
end
end
end
...
...
activerecord/test/cases/transactions_test.rb
浏览文件 @
88882964
...
...
@@ -546,7 +546,7 @@ def test_sqlite_add_column_in_transaction
def
test_transactions_state_from_rollback
connection
=
Topic
.
connection
transaction
=
ActiveRecord
::
ConnectionAdapters
::
ClosedTransaction
.
new
(
connection
).
begi
n
transaction
=
ActiveRecord
::
ConnectionAdapters
::
TransactionManager
.
new
(
connection
).
begin_transactio
n
assert
transaction
.
open?
assert
!
transaction
.
state
.
rolledback?
...
...
@@ -560,7 +560,7 @@ def test_transactions_state_from_rollback
def
test_transactions_state_from_commit
connection
=
Topic
.
connection
transaction
=
ActiveRecord
::
ConnectionAdapters
::
ClosedTransaction
.
new
(
connection
).
begi
n
transaction
=
ActiveRecord
::
ConnectionAdapters
::
TransactionManager
.
new
(
connection
).
begin_transactio
n
assert
transaction
.
open?
assert
!
transaction
.
state
.
rolledback?
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录