Merge pull request rails#53230 from kamipo/allow_select_with_reserved_words_aliases

Allow `select` with reserved words aliases

Author: kamipo

activerecord/lib/active_record/relation/query_methods.rb

@@ -2227,14 +2227,16 @@ 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).as(column_alias.to_s)
+              arel_column_with_table(table_name, column.to_s)
+                .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)
             end
           when String, Symbol
-            arel_column(key).as(columns_aliases.to_s)
+            arel_column(key)
+              .as(model.adapter_class.quote_column_name(columns_aliases.to_s))
           end
         end
       end

activerecord/test/cases/relation/select_test.rb

@@ -19,7 +19,8 @@ def test_select_with_non_field_values
     end
 
     def test_select_with_non_field_hash_values
-      expected = %r/\ASELECT 1 AS a, foo\(\) AS b, #{Regexp.escape(quote_table_name("bar"))} AS c FROM/
+      q = -> name { Regexp.escape(quote_table_name(name)) }
+      expected = %r/\ASELECT 1 AS #{q["a"]}, foo\(\) AS #{q["b"]}, #{q["bar"]} AS #{q["c"]} FROM/
       assert_match expected, Post.select("1" => :a, "foo()" => :b, :bar => :c).to_sql
     end
 
@@ -30,6 +31,13 @@ def test_select_with_hash_argument
       assert_equal "Welcome to the weblog", post.post_title
     end
 
+    def test_select_with_reserved_words_aliases
+      post = Post.select("UPPER(title)" => :from, title: :group).first
+
+      assert_equal "WELCOME TO THE WEBLOG", post.from
+      assert_equal "Welcome to the weblog", post.group
+    end
+
     def test_select_with_one_level_hash_argument
       post = Post.select("UPPER(title)" => :title, title: :post_title).first
 
@@ -38,7 +46,8 @@ def test_select_with_one_level_hash_argument
     end
 
     def test_select_with_not_exists_field
-      expected = %r/\ASELECT #{Regexp.escape(quote_table_name("foo"))} AS post_title FROM/
+      q = -> name { Regexp.escape(quote_table_name(name)) }
+      expected = %r/\ASELECT #{q["foo"]} AS #{q["post_title"]} FROM/
       assert_match expected, Post.select(foo: :post_title).to_sql
 
       skip if sqlite3_adapter_strict_strings_disabled?
@@ -49,7 +58,8 @@ def test_select_with_not_exists_field
     end
 
     def test_select_with_hash_with_not_exists_field
-      expected = %r/\ASELECT #{Regexp.escape(quote_table_name("posts.bar"))} AS post_title FROM/
+      q = -> name { Regexp.escape(quote_table_name(name)) }
+      expected = %r/\ASELECT #{q["posts.bar"]} AS #{q["post_title"]} FROM/
       assert_match expected, Post.select(posts: { bar: :post_title }).to_sql
 
       assert_raises(ActiveRecord::StatementInvalid) do
@@ -58,7 +68,8 @@ def test_select_with_hash_with_not_exists_field
     end
 
     def test_select_with_hash_array_value_with_not_exists_field
-      expected = %r/\ASELECT #{Regexp.escape(quote_table_name("posts.bar"))}, #{Regexp.escape(quote_table_name("posts.id"))} FROM/
+      q = -> name { Regexp.escape(quote_table_name(name)) }
+      expected = %r/\ASELECT #{q["posts.bar"]}, #{q["posts.id"]} FROM/
       assert_match expected, Post.select(posts: [:bar, :id]).to_sql
 
       assert_raises(ActiveRecord::StatementInvalid) do