Remove duplicated attribute alias resolution in _select!

This is also resolved in `arel_column`.

Author: kamipo

activerecord/lib/active_record/relation/query_methods.rb

@@ -252,9 +252,6 @@ def select(*fields)
     def _select!(*fields) # :nodoc:
       fields.reject!(&:blank?)
       fields.flatten!
-      fields.map! do |field|
-        klass.attribute_alias?(field) ? klass.attribute_alias(field).to_sym : field
-      end
       self.select_values += fields
       self
     end
@@ -1164,9 +1161,9 @@ def arel_columns(columns)
           case field
           when Symbol
             field = field.to_s
-            arel_column(field) { connection.quote_table_name(field) }
+            arel_column(field, &connection.method(:quote_table_name))
           when String
-            arel_column(field) { field }
+            arel_column(field, &:itself)
           when Proc
             field.call
           else
@@ -1182,7 +1179,7 @@ def arel_column(field)
         if klass.columns_hash.key?(field) && (!from || table_name_matches?(from))
           arel_attribute(field)
         else
-          yield
+          yield field
         end
       end
 

activerecord/test/cases/relation_test.rb

@@ -292,6 +292,7 @@ def test_selecting_aliased_attribute_quotes_column_name_when_from_is_used
       klass.create!(description: "foo")
 
       assert_equal ["foo"], klass.select(:description).from(klass.all).map(&:desc)
+      assert_equal ["foo"], klass.reselect(:description).from(klass.all).map(&:desc)
     end
 
     def test_relation_merging_with_merged_joins_as_strings