Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
5f7f3bb1
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,发现更多精彩内容 >>
提交
5f7f3bb1
编写于
3月 05, 2014
作者:
Y
Yves Senn
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14263 from robin850/allow_passing_string_to_order_hash
Follow up of #10732 - Allow string hash values on AR order method
上级
ef7e7ad7
acbd7ab2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
52 addition
and
5 deletion
+52
-5
activerecord/CHANGELOG.md
activerecord/CHANGELOG.md
+10
-0
activerecord/lib/active_record/relation/query_methods.rb
activerecord/lib/active_record/relation/query_methods.rb
+6
-3
activerecord/test/cases/relations_test.rb
activerecord/test/cases/relations_test.rb
+36
-2
未找到文件。
activerecord/CHANGELOG.md
浏览文件 @
5f7f3bb1
*
Allow strings to specify the
`#order`
value.
Example:
Model.order(id: 'asc').to_sql == Model.order(id: :asc).to_sql
Fixes #10732.
*Marcelo Casiraghi*
*
Dynamically register PostgreSQL enum OIDs. This prevents "unknown OID"
warnings on enum columns.
...
...
activerecord/lib/active_record/relation/query_methods.rb
浏览文件 @
5f7f3bb1
...
...
@@ -1030,10 +1030,13 @@ def build_order(arel)
arel
.
order
(
*
orders
)
unless
orders
.
empty?
end
VALID_DIRECTIONS
=
[
:asc
,
:desc
,
'asc'
,
'desc'
]
# :nodoc:
def
validate_order_args
(
args
)
args
.
grep
(
Hash
)
do
|
h
|
unless
(
h
.
values
-
[
:asc
,
:desc
]).
empty?
raise
ArgumentError
,
'Direction should be :asc or :desc'
h
.
values
.
map
(
&
:downcase
).
each
do
|
value
|
raise
ArgumentError
,
"Direction '
#{
value
}
' is invalid. Valid "
\
"directions are asc and desc."
unless
VALID_DIRECTIONS
.
include?
(
value
)
end
end
end
...
...
@@ -1055,7 +1058,7 @@ def preprocess_order_args(order_args)
when
Hash
arg
.
map
{
|
field
,
dir
|
field
=
klass
.
attribute_alias
(
field
)
if
klass
.
attribute_alias?
(
field
)
table
[
field
].
send
(
dir
)
table
[
field
].
send
(
dir
.
downcase
)
}
else
arg
...
...
activerecord/test/cases/relations_test.rb
浏览文件 @
5f7f3bb1
...
...
@@ -171,7 +171,6 @@ def test_finding_with_order
assert_equal
topics
(
:first
).
title
,
topics
.
first
.
title
end
def
test_finding_with_arel_order
topics
=
Topic
.
order
(
Topic
.
arel_table
[
:id
].
asc
)
assert_equal
5
,
topics
.
to_a
.
size
...
...
@@ -194,8 +193,43 @@ def test_order_with_hash_and_symbol_generates_the_same_sql
assert_equal
Topic
.
order
(
:id
).
to_sql
,
Topic
.
order
(
:id
=>
:asc
).
to_sql
end
def
test_finding_with_desc_order_with_string
topics
=
Topic
.
order
(
id:
"desc"
)
assert_equal
5
,
topics
.
to_a
.
size
assert_equal
[
topics
(
:fifth
),
topics
(
:fourth
),
topics
(
:third
),
topics
(
:second
),
topics
(
:first
)],
topics
.
to_a
end
def
test_finding_with_asc_order_with_string
topics
=
Topic
.
order
(
id:
'asc'
)
assert_equal
5
,
topics
.
to_a
.
size
assert_equal
[
topics
(
:first
),
topics
(
:second
),
topics
(
:third
),
topics
(
:fourth
),
topics
(
:fifth
)],
topics
.
to_a
end
def
test_nothing_raises_on_upcase_desc_arg
Topic
.
order
(
id:
"DESC"
)
end
def
test_nothing_raises_on_downcase_desc_arg
Topic
.
order
(
id:
"desc"
)
end
def
test_nothing_raises_on_upcase_asc_arg
Topic
.
order
(
id:
"ASC"
)
end
def
test_nothing_raises_on_downcase_asc_arg
Topic
.
order
(
id:
"asc"
)
end
def
test_nothing_raises_on_case_insensitive_args
Topic
.
order
(
id:
"DeSc"
)
Topic
.
order
(
id: :DeSc
)
Topic
.
order
(
id:
"aSc"
)
Topic
.
order
(
id: :aSc
)
end
def
test_raising_exception_on_invalid_hash_params
assert_raise
(
ArgumentError
)
{
Topic
.
order
(
:name
,
"id DESC"
,
:id
=>
:DeSc
)
}
assert_raise
(
ArgumentError
)
{
Topic
.
order
(
:name
,
"id DESC"
,
id: :asfsdf
)
}
end
def
test_finding_last_with_arel_order
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录