Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
7f35c409
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,发现更多精彩内容 >>
提交
7f35c409
编写于
7月 01, 2013
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #11229 from neerajdotname/deprecated-default-scope
calling default_scope without a proc will raise ArgumentError
上级
aa3ff85f
71db2420
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
6 deletion
+8
-6
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+4
-0
activerecord/lib/active_record/scoping/default.rb
activerecord/lib/active_record/scoping/default.rb
+2
-3
activerecord/test/cases/scoping/named_scoping_test.rb
activerecord/test/cases/scoping/named_scoping_test.rb
+2
-3
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
7f35c409
*
Calling default_scope without a proc will now raise
`ArgumentError`
.
*Neeraj Singh*
*
Removed deprecated method
`type_cast_code`
from Column.
*Neeraj Singh*
...
...
activerecord/lib/active_record/scoping/default.rb
浏览文件 @
7f35c409
...
...
@@ -83,12 +83,11 @@ def default_scope(scope = nil)
scope
=
Proc
.
new
if
block_given?
if
scope
.
is_a?
(
Relation
)
||
!
scope
.
respond_to?
(
:call
)
ActiveSupport
::
Deprecation
.
warn
(
"
Calling #default_scope without a block is deprecat
ed. For example instead "
\
raise
ArgumentError
,
"
Support for calling #default_scope without a block is remov
ed. For example instead "
\
"of `default_scope where(color: 'red')`, please use "
\
"`default_scope { where(color: 'red') }`. (Alternatively you can just redefine "
\
"self.default_scope.)"
)
end
self
.
default_scopes
+=
[
scope
]
...
...
activerecord/test/cases/scoping/named_scoping_test.rb
浏览文件 @
7f35c409
...
...
@@ -445,14 +445,13 @@ def test_eager_scopes_are_deprecated
assert_equal
[
posts
(
:welcome
).
title
],
klass
.
welcome_2
.
map
(
&
:title
)
end
def
test_eager_default_scope_relations_are_
deprecated
def
test_eager_default_scope_relations_are_
remove
klass
=
Class
.
new
(
ActiveRecord
::
Base
)
klass
.
table_name
=
'posts'
assert_
deprecated
do
assert_
raises
(
ArgumentError
)
do
klass
.
send
(
:default_scope
,
klass
.
where
(
:id
=>
posts
(
:welcome
).
id
))
end
assert_equal
[
posts
(
:welcome
).
title
],
klass
.
all
.
map
(
&
:title
)
end
def
test_subclass_merges_scopes_properly
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录