Fix `order` with custom attributes

This follows up 0ee96d13de29680e148ccb8e5b68025f29fd091c.

4 files changed, 21 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 75976aa8fc..78533e8ff2 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -1157,14 +1157,20 @@ module ActiveRecord
         order_args.map! do |arg|
           case arg
           when Symbol
-            arel_attribute(arg).asc
+            field = arg.to_s
+            arel_column(field) {
+              Arel.sql(connection.quote_table_name(field))
+            }.asc
           when Hash
             arg.map { |field, dir|
               case field
               when Arel::Nodes::SqlLiteral
                 field.send(dir.downcase)
               else
-                arel_attribute(field).send(dir.downcase)
+                field = field.to_s
+                arel_column(field) {
+                  Arel.sql(connection.quote_table_name(field))
+                }.send(dir.downcase)
               end
             }
           else
diff --git a/activerecord/test/cases/relation/mutation_test.rb b/activerecord/test/cases/relation/mutation_test.rb
index f82ecd4449..96249b8d51 100644
--- a/activerecord/test/cases/relation/mutation_test.rb
+++ b/activerecord/test/cases/relation/mutation_test.rb
@@ -26,7 +26,7 @@ module ActiveRecord
       assert relation.order!(:name).equal?(relation)
       node = relation.order_values.first
       assert_predicate node, :ascending?
-      assert_equal :name, node.expr.name
+      assert_equal "name", node.expr.name
       assert_equal "posts", node.expr.relation.name
     end
 
@@ -89,7 +89,7 @@ module ActiveRecord
       node = relation.order_values.first
 
       assert_predicate node, :ascending?
-      assert_equal :name, node.expr.name
+      assert_equal "name", node.expr.name
       assert_equal "posts", node.expr.relation.name
     end
 
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 2ac81ba425..b1eba05933 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1852,6 +1852,13 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal contract.metadata, company.metadata
   end
 
+  test "joins with order by custom attribute" do
+    companies = Company.create!([{ name: "test1" }, { name: "test2" }])
+    companies.each { |company| company.contracts.create! }
+    assert_equal companies, Company.joins(:contracts).order(:metadata)
+    assert_equal companies.reverse, Company.joins(:contracts).order(metadata: :desc)
+  end
+
   test "delegations do not leak to other classes" do
     Topic.all.by_lifo
     assert Topic.all.class.method_defined?(:by_lifo)
diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb
index 65d1fce66d..c6eb77dba4 100644
--- a/activerecord/test/models/post.rb
+++ b/activerecord/test/models/post.rb
@@ -328,6 +328,10 @@ class FakeKlass
       # noop
     end
 
+    def columns_hash
+      { "name" => nil }
+    end
+
     def arel_table
       Post.arel_table
     end