Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
efbb85c8
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 搜索 >>
提交
efbb85c8
编写于
1月 03, 2012
作者:
M
Matt Jones + Scott Walker
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
correctly handle order calls after a reorder
上级
9f76659b
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
25 addition
and
9 deletion
+25
-9
activerecord/lib/active_record/relation.rb
activerecord/lib/active_record/relation.rb
+1
-1
activerecord/lib/active_record/relation/finder_methods.rb
activerecord/lib/active_record/relation/finder_methods.rb
+2
-2
activerecord/lib/active_record/relation/query_methods.rb
activerecord/lib/active_record/relation/query_methods.rb
+4
-3
activerecord/lib/active_record/relation/spawn_methods.rb
activerecord/lib/active_record/relation/spawn_methods.rb
+11
-2
activerecord/test/cases/relation_scoping_test.rb
activerecord/test/cases/relation_scoping_test.rb
+6
-0
activerecord/test/cases/relation_test.rb
activerecord/test/cases/relation_test.rb
+1
-1
未找到文件。
activerecord/lib/active_record/relation.rb
浏览文件 @
efbb85c8
...
...
@@ -8,7 +8,7 @@ class Relation
JoinOperation
=
Struct
.
new
(
:relation
,
:join_class
,
:on
)
ASSOCIATION_METHODS
=
[
:includes
,
:eager_load
,
:preload
]
MULTI_VALUE_METHODS
=
[
:select
,
:group
,
:order
,
:joins
,
:where
,
:having
,
:bind
]
SINGLE_VALUE_METHODS
=
[
:limit
,
:offset
,
:lock
,
:readonly
,
:from
,
:reorder
,
:reverse_order
,
:uniq
]
SINGLE_VALUE_METHODS
=
[
:limit
,
:offset
,
:lock
,
:readonly
,
:from
,
:reorder
ing
,
:reverse_order
,
:uniq
]
include
FinderMethods
,
Calculations
,
SpawnMethods
,
QueryMethods
,
Batches
,
Explain
,
Delegation
...
...
activerecord/lib/active_record/relation/finder_methods.rb
浏览文件 @
efbb85c8
...
...
@@ -134,7 +134,7 @@ def first!
def
last
(
*
args
)
if
args
.
any?
if
args
.
first
.
kind_of?
(
Integer
)
||
(
loaded?
&&
!
args
.
first
.
kind_of?
(
Hash
))
if
order_values
.
empty?
&&
reorder_value
.
nil?
if
order_values
.
empty?
order
(
"
#{
primary_key
}
DESC"
).
limit
(
*
args
).
reverse
else
to_a
.
last
(
*
args
)
...
...
@@ -249,7 +249,7 @@ def apply_join_dependency(relation, join_dependency)
end
def
construct_limited_ids_condition
(
relation
)
orders
=
(
relation
.
reorder_value
||
relation
.
order_values
)
.
map
{
|
val
|
val
.
presence
}.
compact
orders
=
relation
.
order_values
.
map
{
|
val
|
val
.
presence
}.
compact
values
=
@klass
.
connection
.
distinct
(
"
#{
@klass
.
connection
.
quote_table_name
table_name
}
.
#{
primary_key
}
"
,
orders
)
relation
=
relation
.
dup
...
...
activerecord/lib/active_record/relation/query_methods.rb
浏览文件 @
efbb85c8
...
...
@@ -9,7 +9,7 @@ module QueryMethods
:select_values
,
:group_values
,
:order_values
,
:joins_values
,
:where_values
,
:having_values
,
:bind_values
,
:limit_value
,
:offset_value
,
:lock_value
,
:readonly_value
,
:create_with_value
,
:from_value
,
:reorder_value
,
:reverse_order_value
,
:from_value
,
:reorder
ing
_value
,
:reverse_order_value
,
:uniq_value
def
includes
(
*
args
)
...
...
@@ -97,7 +97,8 @@ def reorder(*args)
return
self
if
args
.
blank?
relation
=
clone
relation
.
reorder_value
=
args
.
flatten
relation
.
reordering_value
=
true
relation
.
order_values
=
args
.
flatten
relation
end
...
...
@@ -263,7 +264,7 @@ def build_arel
arel
.
group
(
*
@group_values
.
uniq
.
reject
{
|
g
|
g
.
blank?
})
unless
@group_values
.
empty?
order
=
@
reorder_value
?
@reorder_value
:
@
order_values
order
=
@order_values
order
=
reverse_sql_order
(
order
)
if
@reverse_order_value
arel
.
order
(
*
order
.
uniq
.
reject
{
|
o
|
o
.
blank?
})
unless
order
.
empty?
...
...
activerecord/lib/active_record/relation/spawn_methods.rb
浏览文件 @
efbb85c8
...
...
@@ -22,7 +22,7 @@ def merge(r)
end
end
(
Relation
::
MULTI_VALUE_METHODS
-
[
:joins
,
:where
]).
each
do
|
method
|
(
Relation
::
MULTI_VALUE_METHODS
-
[
:joins
,
:where
,
:order
]).
each
do
|
method
|
value
=
r
.
send
(
:"
#{
method
}
_values"
)
merged_relation
.
send
(
:"
#{
method
}
_values="
,
merged_relation
.
send
(
:"
#{
method
}
_values"
)
+
value
)
if
value
.
present?
end
...
...
@@ -48,7 +48,7 @@ def merge(r)
merged_relation
.
where_values
=
merged_wheres
(
Relation
::
SINGLE_VALUE_METHODS
-
[
:lock
,
:create_with
]).
each
do
|
method
|
(
Relation
::
SINGLE_VALUE_METHODS
-
[
:lock
,
:create_with
,
:reordering
]).
each
do
|
method
|
value
=
r
.
send
(
:"
#{
method
}
_value"
)
merged_relation
.
send
(
:"
#{
method
}
_value="
,
value
)
unless
value
.
nil?
end
...
...
@@ -57,6 +57,15 @@ def merge(r)
merged_relation
=
merged_relation
.
create_with
(
r
.
create_with_value
)
unless
r
.
create_with_value
.
empty?
if
(
r
.
reordering_value
)
# override any order specified in the original relation
merged_relation
.
reordering_value
=
true
merged_relation
.
order_values
=
r
.
order_values
else
# merge in order_values from r
merged_relation
.
order_values
+=
r
.
order_values
end
# Apply scope extension modules
merged_relation
.
send
:apply_modules
,
r
.
extensions
...
...
activerecord/test/cases/relation_scoping_test.rb
浏览文件 @
efbb85c8
...
...
@@ -421,6 +421,12 @@ def test_reorder_overrides_default_scope_order
assert_equal
expected
,
received
end
def
test_order_after_reorder_combines_orders
expected
=
Developer
.
order
(
'name DESC, id DESC'
).
collect
{
|
dev
|
[
dev
.
name
,
dev
.
id
]
}
received
=
Developer
.
order
(
'name ASC'
).
reorder
(
'name DESC'
).
order
(
'id DESC'
).
collect
{
|
dev
|
[
dev
.
name
,
dev
.
id
]
}
assert_equal
expected
,
received
end
def
test_nested_exclusive_scope
expected
=
Developer
.
find
(
:all
,
:limit
=>
100
).
collect
{
|
dev
|
dev
.
salary
}
received
=
DeveloperOrderedBySalary
.
send
(
:with_exclusive_scope
,
:find
=>
{
:limit
=>
100
})
do
...
...
activerecord/test/cases/relation_test.rb
浏览文件 @
efbb85c8
...
...
@@ -20,7 +20,7 @@ def test_construction
end
def
test_single_values
assert_equal
[
:limit
,
:offset
,
:lock
,
:readonly
,
:from
,
:reorder
,
:reverse_order
,
:uniq
].
map
(
&
:to_s
).
sort
,
assert_equal
[
:limit
,
:offset
,
:lock
,
:readonly
,
:from
,
:reorder
ing
,
:reverse_order
,
:uniq
].
map
(
&
:to_s
).
sort
,
Relation
::
SINGLE_VALUE_METHODS
.
map
(
&
:to_s
).
sort
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录