Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
e5abb89c
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,发现更多精彩内容 >>
提交
e5abb89c
编写于
6月 25, 2012
作者:
C
Carlos Antonio da Silva
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Ensure Arel columns are typecasted properly when grouping with calculation
Fix build issue with postgresql.
上级
07875be9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
9 deletion
+13
-9
activerecord/lib/active_record/relation/calculations.rb
activerecord/lib/active_record/relation/calculations.rb
+6
-6
activerecord/test/cases/calculations_test.rb
activerecord/test/cases/calculations_test.rb
+7
-3
未找到文件。
activerecord/lib/active_record/relation/calculations.rb
浏览文件 @
e5abb89c
...
...
@@ -265,9 +265,9 @@ def execute_grouped_calculation(operation, column_name, distinct) #:nodoc:
group_attrs
=
group_values
if
group_attrs
.
first
.
respond_to?
(
:to_sym
)
association
=
@klass
.
reflect_on_association
(
group_attrs
.
first
.
to_sym
)
associated
=
group_attrs
.
size
==
1
&&
association
&&
association
.
macro
==
:belongs_to
# only count belongs_to associations
group_fields
=
Array
(
associated
?
association
.
foreign_key
:
group_attrs
)
association
=
@klass
.
reflect_on_association
(
group_attrs
.
first
.
to_sym
)
associated
=
group_attrs
.
size
==
1
&&
association
&&
association
.
macro
==
:belongs_to
# only count belongs_to associations
group_fields
=
Array
(
associated
?
association
.
foreign_key
:
group_attrs
)
else
group_fields
=
group_attrs
end
...
...
@@ -313,10 +313,10 @@ def execute_grouped_calculation(operation, column_name, distinct) #:nodoc:
end
Hash
[
calculated_data
.
map
do
|
row
|
key
=
group_columns
.
map
{
|
aliaz
,
column
|
key
=
group_columns
.
map
{
|
aliaz
,
column
|
type_cast_calculated_value
(
row
[
aliaz
],
column
)
}
key
=
key
.
first
if
key
.
size
==
1
key
=
key
.
first
if
key
.
size
==
1
key
=
key_records
[
key
]
if
associated
[
key
,
type_cast_calculated_value
(
row
[
aggregate_alias
],
column_for
(
column_name
),
operation
)]
end
]
...
...
@@ -343,7 +343,7 @@ def column_alias_for(*keys)
end
def
column_for
(
field
)
field_name
=
field
.
to_s
.
split
(
'.'
).
last
field_name
=
field
.
respond_to?
(
:name
)
?
field
.
name
.
to_s
:
field
.
to_s
.
split
(
'.'
).
last
@klass
.
columns
.
detect
{
|
c
|
c
.
name
.
to_s
==
field_name
}
end
...
...
activerecord/test/cases/calculations_test.rb
浏览文件 @
e5abb89c
...
...
@@ -58,12 +58,16 @@ def test_should_get_minimum_of_field
def
test_should_group_by_field
c
=
Account
.
group
(
:firm_id
).
sum
(
:credit_limit
)
[
1
,
6
,
2
].
each
{
|
firm_id
|
assert
c
.
keys
.
include?
(
firm_id
)
}
[
1
,
6
,
2
].
each
do
|
firm_id
|
assert
c
.
keys
.
include?
(
firm_id
),
"Group
#{
c
.
inspect
}
does not contain firm_id
#{
firm_id
}
"
end
end
def
test_should_group_by_arel_attribute
c
=
Account
.
sum
(
:credit_limit
,
:group
=>
Account
.
arel_table
[
:firm_id
])
[
1
,
6
,
2
].
each
{
|
firm_id
|
assert
c
.
keys
.
include?
(
firm_id
)
}
c
=
Account
.
group
(
Account
.
arel_table
[
:firm_id
]).
sum
(
:credit_limit
)
[
1
,
6
,
2
].
each
do
|
firm_id
|
assert
c
.
keys
.
include?
(
firm_id
),
"Group
#{
c
.
inspect
}
does not contain firm_id
#{
firm_id
}
"
end
end
def
test_should_group_by_multiple_fields
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录