mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
use a map and flatten to avoid << calls on array
This commit is contained in:
parent
784177aeee
commit
4be0fc124a
1 changed files with 5 additions and 7 deletions
|
@ -987,17 +987,15 @@ module ActiveRecord #:nodoc:
|
||||||
|
|
||||||
# Similar in purpose to +expand_hash_conditions_for_aggregates+.
|
# Similar in purpose to +expand_hash_conditions_for_aggregates+.
|
||||||
def expand_attribute_names_for_aggregates(attribute_names)
|
def expand_attribute_names_for_aggregates(attribute_names)
|
||||||
expanded_attribute_names = []
|
attribute_names.map { |attribute_name|
|
||||||
attribute_names.each do |attribute_name|
|
|
||||||
unless (aggregation = reflect_on_aggregation(attribute_name.to_sym)).nil?
|
unless (aggregation = reflect_on_aggregation(attribute_name.to_sym)).nil?
|
||||||
aggregate_mapping(aggregation).each do |field_attr, aggregate_attr|
|
aggregate_mapping(aggregation).map do |field_attr, _|
|
||||||
expanded_attribute_names << field_attr.to_sym
|
field_attr.to_sym
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
expanded_attribute_names << attribute_name.to_sym
|
attribute_name.to_sym
|
||||||
end
|
end
|
||||||
end
|
}.flatten
|
||||||
expanded_attribute_names
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def all_attributes_exists?(attribute_names)
|
def all_attributes_exists?(attribute_names)
|
||||||
|
|
Loading…
Reference in a new issue