From 2ab3751781e34ca4a8d477ba53ff307ae9884b0d Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Tue, 9 Apr 2019 22:38:08 +0900
Subject: [PATCH] Remove duplicated attribute alias resolution in `_select!`

This is also resolved in `arel_column`.
---
 activerecord/lib/active_record/relation/query_methods.rb | 9 +++------
 activerecord/test/cases/relation_test.rb                 | 1 +
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 7ea18c3069..90b5e9a118 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -252,9 +252,6 @@ module ActiveRecord
     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 @@ module ActiveRecord
           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 @@ module ActiveRecord
         if klass.columns_hash.key?(field) && (!from || table_name_matches?(from))
           arel_attribute(field)
         else
-          yield
+          yield field
         end
       end
 
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 90b208092f..3f370e5ede 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -292,6 +292,7 @@ module ActiveRecord
       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