提交 34d2aed0 编写于 作者: E Eileen M. Uchitelle 提交者: GitHub

Merge pull request #26446 from kamipo/rename_type_var_name_to_type

Rename variable name that returning `type_for` to `type` from `column`
......@@ -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.
先完成此消息的编辑!
想要评论请 注册