Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
a14f0669
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,体验更适合开发者的 AI 搜索 >>
提交
a14f0669
编写于
9月 09, 2020
作者:
K
KapilSachdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Merge pull request #40178 from tgxworld/raise_error_from_delete_all"
This reverts commit
b8ab1f89
, reversing changes made to
73ae5655
.
上级
015c3932
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
2 addition
and
4 deletion
+2
-4
activerecord/lib/active_record/relation.rb
activerecord/lib/active_record/relation.rb
+2
-3
activerecord/test/cases/relation/delete_all_test.rb
activerecord/test/cases/relation/delete_all_test.rb
+0
-1
未找到文件。
activerecord/lib/active_record/relation.rb
浏览文件 @
a14f0669
...
...
@@ -11,7 +11,7 @@ class Relation
:reverse_order
,
:distinct
,
:create_with
,
:skip_query_cache
]
CLAUSE_METHODS
=
[
:where
,
:having
,
:from
]
INVALID_METHODS_FOR_DELETE_ALL
=
[
:distinct
,
:group
,
:having
,
:from
]
INVALID_METHODS_FOR_DELETE_ALL
=
[
:distinct
,
:group
,
:having
]
VALUE_METHODS
=
MULTI_VALUE_METHODS
+
SINGLE_VALUE_METHODS
+
CLAUSE_METHODS
...
...
@@ -577,9 +577,8 @@ def destroy_all
def
delete_all
invalid_methods
=
INVALID_METHODS_FOR_DELETE_ALL
.
select
do
|
method
|
value
=
@values
[
method
]
[
:distinct
,
:from
].
include?
(
method
)
?
value
:
value
&
.
any?
method
==
:distinct
?
value
:
value
&
.
any?
end
if
invalid_methods
.
any?
raise
ActiveRecordError
.
new
(
"delete_all doesn't support
#{
invalid_methods
.
join
(
', '
)
}
"
)
end
...
...
activerecord/test/cases/relation/delete_all_test.rb
浏览文件 @
a14f0669
...
...
@@ -50,7 +50,6 @@ def test_delete_all_with_unpermitted_relation_raises_error
assert_raises
(
ActiveRecord
::
ActiveRecordError
)
{
Author
.
distinct
.
delete_all
}
assert_raises
(
ActiveRecord
::
ActiveRecordError
)
{
Author
.
group
(
:name
).
delete_all
}
assert_raises
(
ActiveRecord
::
ActiveRecordError
)
{
Author
.
having
(
"SUM(id) < 3"
).
delete_all
}
assert_raises
(
ActiveRecord
::
ActiveRecordError
)
{
Author
.
from
(
"(SELECT * FROM authors) AS authors"
).
delete_all
}
end
def
test_delete_all_with_joins_and_where_part_is_hash
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录