Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
7d83ef4f
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,发现更多精彩内容 >>
提交
7d83ef4f
编写于
12月 12, 2018
作者:
R
Ryuta Kamizono
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Ensure that preventing writes is invoked before `materialize_transactions` consistently
上级
4dd06452
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
13 deletion
+23
-13
activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb
...e_record/connection_adapters/mysql/database_statements.rb
+2
-4
activerecord/test/cases/adapter_test.rb
activerecord/test/cases/adapter_test.rb
+21
-9
未找到文件。
activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb
浏览文件 @
7d83ef4f
...
...
@@ -40,8 +40,6 @@ def execute(sql, name = nil)
end
def
exec_query
(
sql
,
name
=
"SQL"
,
binds
=
[],
prepare:
false
)
materialize_transactions
if
without_prepared_statement?
(
binds
)
execute_and_free
(
sql
,
name
)
do
|
result
|
if
result
...
...
@@ -62,8 +60,6 @@ def exec_query(sql, name = "SQL", binds = [], prepare: false)
end
def
exec_delete
(
sql
,
name
=
nil
,
binds
=
[])
materialize_transactions
if
without_prepared_statement?
(
binds
)
execute_and_free
(
sql
,
name
)
{
@connection
.
affected_rows
}
else
...
...
@@ -126,6 +122,8 @@ def exec_stmt_and_free(sql, name, binds, cache_stmt: false)
raise
ActiveRecord
::
ReadOnlyError
,
"Write query attempted while in readonly mode:
#{
sql
}
"
end
materialize_transactions
# make sure we carry over any changes to ActiveRecord::Base.default_timezone that have been
# made since we established the connection
@connection
.
query_options
[
:database_timezone
]
=
ActiveRecord
::
Base
.
default_timezone
...
...
activerecord/test/cases/adapter_test.rb
浏览文件 @
7d83ef4f
...
...
@@ -166,9 +166,13 @@ class << @connection
end
def
test_errors_when_an_insert_query_is_called_while_preventing_writes
assert_raises
(
ActiveRecord
::
ReadOnlyError
)
do
@connection
.
while_preventing_writes
do
@connection
.
insert
(
"INSERT INTO subscribers(nick) VALUES ('138853948594')"
)
assert_no_queries
do
assert_raises
(
ActiveRecord
::
ReadOnlyError
)
do
@connection
.
while_preventing_writes
do
@connection
.
transaction
do
@connection
.
insert
(
"INSERT INTO subscribers(nick) VALUES ('138853948594')"
,
nil
,
false
)
end
end
end
end
end
...
...
@@ -176,9 +180,13 @@ def test_errors_when_an_insert_query_is_called_while_preventing_writes
def
test_errors_when_an_update_query_is_called_while_preventing_writes
@connection
.
insert
(
"INSERT INTO subscribers(nick) VALUES ('138853948594')"
)
assert_raises
(
ActiveRecord
::
ReadOnlyError
)
do
@connection
.
while_preventing_writes
do
@connection
.
update
(
"UPDATE subscribers SET nick = '9989' WHERE nick = '138853948594'"
)
assert_no_queries
do
assert_raises
(
ActiveRecord
::
ReadOnlyError
)
do
@connection
.
while_preventing_writes
do
@connection
.
transaction
do
@connection
.
update
(
"UPDATE subscribers SET nick = '9989' WHERE nick = '138853948594'"
)
end
end
end
end
end
...
...
@@ -186,9 +194,13 @@ def test_errors_when_an_update_query_is_called_while_preventing_writes
def
test_errors_when_a_delete_query_is_called_while_preventing_writes
@connection
.
insert
(
"INSERT INTO subscribers(nick) VALUES ('138853948594')"
)
assert_raises
(
ActiveRecord
::
ReadOnlyError
)
do
@connection
.
while_preventing_writes
do
@connection
.
delete
(
"DELETE FROM subscribers WHERE nick = '138853948594'"
)
assert_no_queries
do
assert_raises
(
ActiveRecord
::
ReadOnlyError
)
do
@connection
.
while_preventing_writes
do
@connection
.
transaction
do
@connection
.
delete
(
"DELETE FROM subscribers WHERE nick = '138853948594'"
)
end
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录