Merge pull request rails#53526 from kamipo/select_allow_raw_string_value

Fix `select` with a hash not to treat raw strings as identifiers

Author: kamipo

activerecord/lib/active_record/relation/query_methods.rb

@@ -1959,10 +1959,10 @@ def arel_columns_from_hash(fields)
           table_name = table_name.name if table_name.is_a?(Symbol)
           case columns
           when Symbol, String
-            arel_column_with_table(table_name, columns.to_s)
+            arel_column_with_table(table_name, columns)
           when Array
             columns.map do |column|
-              arel_column_with_table(table_name, column.to_s)
+              arel_column_with_table(table_name, column)
             end
           else
             raise TypeError, "Expected Symbol, String or Array, got: #{columns.class}"
@@ -1972,8 +1972,13 @@ def arel_columns_from_hash(fields)
 
       def arel_column_with_table(table_name, column_name)
         self.references_values |= [Arel.sql(table_name, retryable: true)]
-        predicate_builder.resolve_arel_attribute(table_name, column_name) do
-          lookup_table_klass_from_join_dependencies(table_name)
+
+        if column_name.is_a?(Symbol) || !column_name.match?(/\W/)
+          predicate_builder.resolve_arel_attribute(table_name, column_name) do
+            lookup_table_klass_from_join_dependencies(table_name)
+          end
+        else
+          Arel.sql("#{model.adapter_class.quote_table_name(table_name)}.#{column_name}")
         end
       end
 
@@ -1989,6 +1994,8 @@ def arel_column(field)
           arel_column_with_table(table, column)
         elsif block_given?
           yield field
+        elsif Arel.arel_node?(field)
+          field
         else
           Arel.sql(is_symbol ? model.adapter_class.quote_table_name(field) : field)
         end
@@ -2225,12 +2232,12 @@ def arel_column_aliases_from_hash(fields)
           case columns_aliases
           when Hash
             columns_aliases.map do |column, column_alias|
-              arel_column_with_table(table_name, column.to_s)
+              arel_column_with_table(table_name, column)
                 .as(model.adapter_class.quote_column_name(column_alias.to_s))
             end
           when Array
             columns_aliases.map do |column|
-              arel_column_with_table(table_name, column.to_s)
+              arel_column_with_table(table_name, column)
             end
           when String, Symbol
             arel_column(key)

activerecord/test/cases/relation/select_test.rb

@@ -102,9 +102,9 @@ def test_select_with_invalid_nested_field
     end
 
     def test_select_with_hash_argument_without_aliases
-      post = Post.select(posts: [:title, :id]).take
-      assert_not_nil post.title
-      assert_not_nil post.id
+      post = Post.select(posts: [:title, "title as post_title"]).first
+      assert_equal "Welcome to the weblog", post.title
+      assert_equal "Welcome to the weblog", post.post_title
     end
 
     def test_select_with_hash_argument_with_few_tables