Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
af71a822
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 搜索 >>
未验证
提交
af71a822
编写于
5月 16, 2020
作者:
R
Ryuta Kamizono
提交者:
GitHub
5月 16, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #39297 from kamipo/fix_group_by_order_and_limit_offset
Fix group by count with eager loading + order + limit/offset
上级
2eb7aa11
5812feff
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
6 deletion
+6
-6
activerecord/lib/active_record/relation/calculations.rb
activerecord/lib/active_record/relation/calculations.rb
+1
-1
activerecord/test/cases/calculations_test.rb
activerecord/test/cases/calculations_test.rb
+5
-5
未找到文件。
activerecord/lib/active_record/relation/calculations.rb
浏览文件 @
af71a822
...
@@ -136,7 +136,7 @@ def calculate(operation, column_name)
...
@@ -136,7 +136,7 @@ def calculate(operation, column_name)
relation
.
select_values
=
[
klass
.
primary_key
||
table
[
Arel
.
star
]
]
relation
.
select_values
=
[
klass
.
primary_key
||
table
[
Arel
.
star
]
]
end
end
# PostgreSQL: ORDER BY expressions must appear in SELECT list when using DISTINCT
# PostgreSQL: ORDER BY expressions must appear in SELECT list when using DISTINCT
relation
.
order_values
=
[]
relation
.
order_values
=
[]
if
group_values
.
empty?
end
end
relation
.
calculate
(
operation
,
column_name
)
relation
.
calculate
(
operation
,
column_name
)
...
...
activerecord/test/cases/calculations_test.rb
浏览文件 @
af71a822
...
@@ -851,20 +851,20 @@ def test_group_by_with_order_by_virtual_count_attribute
...
@@ -851,20 +851,20 @@ def test_group_by_with_order_by_virtual_count_attribute
end
if
current_adapter?
(
:PostgreSQLAdapter
)
end
if
current_adapter?
(
:PostgreSQLAdapter
)
def
test_group_by_with_limit
def
test_group_by_with_limit
expected
=
{
"
Post"
=>
8
,
"SpecialPost"
=>
1
}
expected
=
{
"
StiPost"
=>
2
,
"SpecialPost"
=>
1
}
actual
=
Post
.
includes
(
:comments
).
group
(
:type
).
order
(
:type
).
limit
(
2
).
count
(
"comments.id"
)
actual
=
Post
.
includes
(
:comments
).
group
(
:type
).
order
(
type: :desc
).
limit
(
2
).
count
(
"comments.id"
)
assert_equal
expected
,
actual
assert_equal
expected
,
actual
end
end
def
test_group_by_with_offset
def
test_group_by_with_offset
expected
=
{
"SpecialPost"
=>
1
,
"
StiPost"
=>
2
}
expected
=
{
"SpecialPost"
=>
1
,
"
Post"
=>
8
}
actual
=
Post
.
includes
(
:comments
).
group
(
:type
).
order
(
:type
).
offset
(
1
).
count
(
"comments.id"
)
actual
=
Post
.
includes
(
:comments
).
group
(
:type
).
order
(
type: :desc
).
offset
(
1
).
count
(
"comments.id"
)
assert_equal
expected
,
actual
assert_equal
expected
,
actual
end
end
def
test_group_by_with_limit_and_offset
def
test_group_by_with_limit_and_offset
expected
=
{
"SpecialPost"
=>
1
}
expected
=
{
"SpecialPost"
=>
1
}
actual
=
Post
.
includes
(
:comments
).
group
(
:type
).
order
(
:type
).
offset
(
1
).
limit
(
1
).
count
(
"comments.id"
)
actual
=
Post
.
includes
(
:comments
).
group
(
:type
).
order
(
type: :desc
).
offset
(
1
).
limit
(
1
).
count
(
"comments.id"
)
assert_equal
expected
,
actual
assert_equal
expected
,
actual
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录