Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
66762b81
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,发现更多精彩内容 >>
提交
66762b81
编写于
12月 27, 2018
作者:
Q
Quan Chau
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Wrap Mysql count of deleted rows in lock block to avoid conflict in test
上级
95a1d872
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
1 deletion
+31
-1
activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb
...e_record/connection_adapters/mysql/database_statements.rb
+3
-1
activerecord/test/cases/adapters/mysql2/count_deleted_rows_with_lock_test.rb
...ases/adapters/mysql2/count_deleted_rows_with_lock_test.rb
+28
-0
未找到文件。
activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb
浏览文件 @
66762b81
...
...
@@ -61,7 +61,9 @@ def exec_query(sql, name = "SQL", binds = [], prepare: false)
def
exec_delete
(
sql
,
name
=
nil
,
binds
=
[])
if
without_prepared_statement?
(
binds
)
execute_and_free
(
sql
,
name
)
{
@connection
.
affected_rows
}
@lock
.
synchronize
do
execute_and_free
(
sql
,
name
)
{
@connection
.
affected_rows
}
end
else
exec_stmt_and_free
(
sql
,
name
,
binds
)
{
|
stmt
|
stmt
.
affected_rows
}
end
...
...
activerecord/test/cases/adapters/mysql2/count_deleted_rows_with_lock_test.rb
0 → 100644
浏览文件 @
66762b81
# frozen_string_literal: true
require
"cases/helper"
require
"support/connection_helper"
require
"models/author"
require
"models/bulb"
module
ActiveRecord
class
CountDeletedRowsWithLockTest
<
ActiveRecord
::
Mysql2TestCase
test
"delete and create in different threads synchronize correctly"
do
Bulb
.
unscoped
.
delete_all
Bulb
.
create!
(
name:
"Jimmy"
,
color:
"blue"
)
delete_thread
=
Thread
.
new
do
Bulb
.
unscoped
.
delete_all
end
create_thread
=
Thread
.
new
do
Author
.
create!
(
name:
"Tommy"
)
end
delete_thread
.
join
create_thread
.
join
assert_equal
1
,
delete_thread
.
value
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录