Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
54a04389
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,发现更多精彩内容 >>
提交
54a04389
编写于
1月 17, 2010
作者:
P
Pratik Naik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make merging of order values consistent
上级
f9a43004
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
6 deletion
+8
-6
activerecord/lib/active_record/relation/spawn_methods.rb
activerecord/lib/active_record/relation/spawn_methods.rb
+1
-1
activerecord/test/cases/base_test.rb
activerecord/test/cases/base_test.rb
+3
-1
activerecord/test/cases/method_scoping_test.rb
activerecord/test/cases/method_scoping_test.rb
+4
-4
未找到文件。
activerecord/lib/active_record/relation/spawn_methods.rb
浏览文件 @
54a04389
...
...
@@ -33,7 +33,7 @@ def merge(r)
from
(
r
.
from_value
).
having
(
r
.
having_values
)
merged_relation
.
order_values
=
Array
.
wrap
(
order_values
)
+
Array
.
wrap
(
r
.
order_values
)
merged_relation
.
order_values
=
r
.
order_values
if
r
.
order_values
.
present?
merged_relation
.
create_with_value
=
@create_with_value
...
...
activerecord/test/cases/base_test.rb
浏览文件 @
54a04389
...
...
@@ -1865,7 +1865,9 @@ def test_scoped_find_order
end
assert
scoped_developers
.
include?
(
developers
(
:poor_jamis
))
assert
scoped_developers
.
include?
(
developers
(
:david
))
assert
scoped_developers
.
include?
(
developers
(
:dev_10
))
assert
!
scoped_developers
.
include?
(
developers
(
:jamis
))
assert_equal
3
,
scoped_developers
.
size
# Test without scoped find conditions to ensure we get the right thing
developers
=
Developer
.
find
(
:all
,
:order
=>
'id'
,
:limit
=>
1
)
assert
scoped_developers
.
include?
(
developers
(
:david
))
...
...
activerecord/test/cases/method_scoping_test.rb
浏览文件 @
54a04389
...
...
@@ -625,21 +625,21 @@ def test_default_scoping_with_inheritance
end
def
test_method_scope
expected
=
Developer
.
find
(
:all
,
:order
=>
'name DESC
, salary DESC
'
).
collect
{
|
dev
|
dev
.
salary
}
expected
=
Developer
.
find
(
:all
,
:order
=>
'name DESC'
).
collect
{
|
dev
|
dev
.
salary
}
received
=
DeveloperOrderedBySalary
.
all_ordered_by_name
.
collect
{
|
dev
|
dev
.
salary
}
assert_equal
expected
,
received
end
def
test_nested_scope
expected
=
Developer
.
find
(
:all
,
:order
=>
'name DESC
, salary DESC
'
).
collect
{
|
dev
|
dev
.
salary
}
expected
=
Developer
.
find
(
:all
,
:order
=>
'name DESC'
).
collect
{
|
dev
|
dev
.
salary
}
received
=
DeveloperOrderedBySalary
.
send
(
:with_scope
,
:find
=>
{
:order
=>
'name DESC'
})
do
DeveloperOrderedBySalary
.
find
(
:all
).
collect
{
|
dev
|
dev
.
salary
}
end
assert_equal
expected
,
received
end
def
test_named_scope_o
rder_appended_to_default_scope_order
expected
=
Developer
.
find
(
:all
,
:order
=>
'name DESC
, salary DESC
'
).
collect
{
|
dev
|
dev
.
name
}
def
test_named_scope_o
verwrites_default
expected
=
Developer
.
find
(
:all
,
:order
=>
'name DESC'
).
collect
{
|
dev
|
dev
.
name
}
received
=
DeveloperOrderedBySalary
.
by_name
.
find
(
:all
).
collect
{
|
dev
|
dev
.
name
}
assert_equal
expected
,
received
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录