Merge pull request #45623 from fatkodima/fix-in_order_of-mysql-strings

Fix `QueryMethods#in_order_of` for non-integer columns in MySQL

Author: yahonda

activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -139,7 +139,7 @@ def supports_insert_on_duplicate_update?
       end
 
       def field_ordered_value(column, values) # :nodoc:
-        field = Arel::Nodes::NamedFunction.new("FIELD", [column, values.reverse])
+        field = Arel::Nodes::NamedFunction.new("FIELD", [column, values.reverse.map { |value| Arel::Nodes.build_quoted(value) }])
         Arel::Nodes::Descending.new(field)
       end
 

activerecord/test/cases/relation/field_ordered_values_test.rb

@@ -51,6 +51,18 @@ def test_in_order_of_expression
     assert_equal(order, posts.map(&:id))
   end
 
+  def test_in_order_of_with_string_column
+    Book.destroy_all
+    Book.create!(format: "paperback")
+    Book.create!(format: "ebook")
+    Book.create!(format: "hardcover")
+
+    order = %w[hardcover paperback ebook]
+    books = Book.in_order_of(:format, order)
+
+    assert_equal(order, books.map(&:format))
+  end
+
   def test_in_order_of_after_regular_order
     order = [3, 4, 1]
     posts = Post.where(type: "Post").order(:type).in_order_of(:id, order)