Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
bac40b9c
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,发现更多精彩内容 >>
提交
bac40b9c
编写于
3月 17, 2017
作者:
R
Rafael França
提交者:
GitHub
3月 17, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #28191 from eugeneius/string_assoc_order
Allow order to be given expressions as hash keys
上级
6f7e7aad
6cf4835b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
30 addition
and
2 deletion
+30
-2
activerecord/lib/active_record/relation/query_methods.rb
activerecord/lib/active_record/relation/query_methods.rb
+6
-1
activerecord/test/cases/relations_test.rb
activerecord/test/cases/relations_test.rb
+24
-1
未找到文件。
activerecord/lib/active_record/relation/query_methods.rb
浏览文件 @
bac40b9c
...
...
@@ -1130,7 +1130,12 @@ def preprocess_order_args(order_args)
arel_attribute
(
arg
).
asc
when
Hash
arg
.
map
{
|
field
,
dir
|
arel_attribute
(
field
).
send
(
dir
.
downcase
)
case
field
when
Arel
::
Nodes
::
SqlLiteral
field
.
send
(
dir
.
downcase
)
else
arel_attribute
(
field
).
send
(
dir
.
downcase
)
end
}
else
arg
...
...
activerecord/test/cases/relations_test.rb
浏览文件 @
bac40b9c
...
...
@@ -218,17 +218,34 @@ def test_finding_with_assoc_order
assert_equal
topics
(
:fifth
).
title
,
topics
.
first
.
title
end
def
test_finding_with_reverted_assoc_order
def
test_finding_with_arel_assoc_order
topics
=
Topic
.
order
(
Arel
.
sql
(
"id"
)
=>
:desc
)
assert_equal
5
,
topics
.
to_a
.
size
assert_equal
topics
(
:fifth
).
title
,
topics
.
first
.
title
end
def
test_finding_with_reversed_assoc_order
topics
=
Topic
.
order
(
id: :asc
).
reverse_order
assert_equal
5
,
topics
.
to_a
.
size
assert_equal
topics
(
:fifth
).
title
,
topics
.
first
.
title
end
def
test_finding_with_reversed_arel_assoc_order
topics
=
Topic
.
order
(
Arel
.
sql
(
"id"
)
=>
:asc
).
reverse_order
assert_equal
5
,
topics
.
to_a
.
size
assert_equal
topics
(
:fifth
).
title
,
topics
.
first
.
title
end
def
test_reverse_order_with_function
topics
=
Topic
.
order
(
"length(title)"
).
reverse_order
assert_equal
topics
(
:second
).
title
,
topics
.
first
.
title
end
def
test_reverse_arel_assoc_order_with_function
topics
=
Topic
.
order
(
Arel
.
sql
(
"length(title)"
)
=>
:asc
).
reverse_order
assert_equal
topics
(
:second
).
title
,
topics
.
first
.
title
end
def
test_reverse_order_with_function_other_predicates
topics
=
Topic
.
order
(
"author_name, length(title), id"
).
reverse_order
assert_equal
topics
(
:second
).
title
,
topics
.
first
.
title
...
...
@@ -251,6 +268,12 @@ def test_reverse_order_with_multiargument_function
end
end
def
test_reverse_arel_assoc_order_with_multiargument_function
assert_nothing_raised
do
Topic
.
order
(
Arel
.
sql
(
"REPLACE(title, '', '')"
)
=>
:asc
).
reverse_order
end
end
def
test_reverse_order_with_nulls_first_or_last
assert_raises
(
ActiveRecord
::
IrreversibleOrderError
)
do
Topic
.
order
(
"title NULLS FIRST"
).
reverse_order
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录