Rename variable name that returning type_for
to type
from column
`column_for` was changed to `type_for` to return `type` object at 36bd52b4. But variable name is still `column`. It is very confusing. Rename variable name `column` to `type` for readability.
This commit is contained in:
parent
cf5f55cd30
commit
0d51369971
@ -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
|
||||
type = type_for(col_name) do
|
||||
calculated_data.column_types.fetch(aliaz, Type.default_value)
|
||||
end
|
||||
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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user