提交 80f989ae 编写于 作者: R Ryuta Kamizono

Remove duplicated attribute alias resolution in `_select!`

This is also resolved in `arel_column`.
上级 63ace8fc
...@@ -232,9 +232,6 @@ def select(*fields) ...@@ -232,9 +232,6 @@ def select(*fields)
def _select!(*fields) # :nodoc: def _select!(*fields) # :nodoc:
fields.flatten! fields.flatten!
fields.map! do |field|
klass.attribute_alias?(field) ? klass.attribute_alias(field).to_sym : field
end
self.select_values += fields self.select_values += fields
self self
end end
...@@ -1054,9 +1051,9 @@ def arel_columns(columns) ...@@ -1054,9 +1051,9 @@ def arel_columns(columns)
case field case field
when Symbol when Symbol
field = field.to_s field = field.to_s
arel_column(field) { connection.quote_table_name(field) } arel_column(field, &connection.method(:quote_table_name))
when String when String
arel_column(field) { field } arel_column(field, &:itself)
when Proc when Proc
field.call field.call
else else
...@@ -1072,7 +1069,7 @@ def arel_column(field) ...@@ -1072,7 +1069,7 @@ def arel_column(field)
if klass.columns_hash.key?(field) && (!from || table_name_matches?(from)) if klass.columns_hash.key?(field) && (!from || table_name_matches?(from))
arel_attribute(field) arel_attribute(field)
else else
yield yield field
end end
end end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册