1 files changed, 10 insertions, 0 deletions
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 8256762f96..5aa0ea85a5 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1897,4 +1897,14 @@ class RelationTest < ActiveRecord::TestCase
   def test_relation_join_method
     assert_equal 'Thank you for the welcome,Thank you again for the welcome', Post.first.comments.join(",")
   end
+
+  def test_selecting_aliased_attribute_quotes_column_name_when_from_is_used
+    klass = Class.new(ActiveRecord::Base) do
+      self.table_name = :test_with_keyword_column_name
+      alias_attribute :description, :desc
+    end
+    klass.create!(description: "foo")
+
+    assert_equal ["foo"], klass.select(:description).from(klass.all).map(&:desc)
+  end
 end