Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
34d2aed0
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,发现更多精彩内容 >>
提交
34d2aed0
编写于
9月 17, 2016
作者:
E
Eileen M. Uchitelle
提交者:
GitHub
9月 17, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #26446 from kamipo/rename_type_var_name_to_type
Rename variable name that returning `type_for` to `type` from `column`
上级
2159a932
0d513699
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
8 addition
and
10 deletion
+8
-10
activerecord/lib/active_record/relation/calculations.rb
activerecord/lib/active_record/relation/calculations.rb
+8
-10
未找到文件。
activerecord/lib/active_record/relation/calculations.rb
浏览文件 @
34d2aed0
...
...
@@ -252,11 +252,11 @@ def execute_simple_calculation(operation, column_name, distinct) #:nodoc:
result
=
@klass
.
connection
.
select_all
(
query_builder
,
nil
,
bound_attributes
)
row
=
result
.
first
value
=
row
&&
row
.
values
.
first
column
=
result
.
column_types
.
fetch
(
column_alias
)
do
type
=
result
.
column_types
.
fetch
(
column_alias
)
do
type_for
(
column_name
)
end
type_cast_calculated_value
(
value
,
column
,
operation
)
type_cast_calculated_value
(
value
,
type
,
operation
)
end
def
execute_grouped_calculation
(
operation
,
column_name
,
distinct
)
#:nodoc:
...
...
@@ -310,18 +310,16 @@ def execute_grouped_calculation(operation, column_name, distinct) #:nodoc:
Hash
[
calculated_data
.
map
do
|
row
|
key
=
group_columns
.
map
{
|
aliaz
,
col_name
|
column
=
type_for
(
col_name
)
do
calculated_data
.
column_types
.
fetch
(
aliaz
)
do
Type
.
default_value
end
type
=
type_for
(
col_name
)
do
calculated_data
.
column_types
.
fetch
(
aliaz
,
Type
.
default_value
)
end
type_cast_calculated_value
(
row
[
aliaz
],
column
)
type_cast_calculated_value
(
row
[
aliaz
],
type
)
}
key
=
key
.
first
if
key
.
size
==
1
key
=
key_records
[
key
]
if
associated
column_
type
=
calculated_data
.
column_types
.
fetch
(
aggregate_alias
)
{
type_for
(
column_name
)
}
[
key
,
type_cast_calculated_value
(
row
[
aggregate_alias
],
column_
type
,
operation
)]
type
=
calculated_data
.
column_types
.
fetch
(
aggregate_alias
)
{
type_for
(
column_name
)
}
[
key
,
type_cast_calculated_value
(
row
[
aggregate_alias
],
type
,
operation
)]
end
]
end
...
...
@@ -356,7 +354,7 @@ def type_cast_calculated_value(value, type, operation = nil)
when
"count"
then
value
.
to_i
when
"sum"
then
type
.
deserialize
(
value
||
0
)
when
"average"
then
value
.
respond_to?
(
:to_d
)
?
value
.
to_d
:
value
else
type
.
deserialize
(
value
)
else
type
.
deserialize
(
value
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录