Merge PR rails#43322

Author: rafaelfranca

activerecord/CHANGELOG.md

@@ -1,3 +1,19 @@
+*   Fix `ActiveRecord::QueryMethods#in_order_of` behavior for integer enums.
+
+    `ActiveRecord::QueryMethods#in_order_of` didn't work as expected for enums stored as integers in the database when passing an array of strings or symbols as the order argument. This unexpected behavior occurred because the string or symbol values were not casted to match the integers in the database.
+
+    The following example now works as expected:
+
+    ```ruby
+    class Book < ApplicationRecord
+      enum status: [:proposed, :written, :published]
+    end
+
+    Book.in_order_of(:status, %w[written published proposed])
+    ```
+
+    *Alexandre Ruban*
+
 *   Ignore persisted in-memory records when merging target lists.
 
     *Kevin Sjöberg*

activerecord/lib/active_record/relation/query_methods.rb

@@ -432,6 +432,7 @@ def in_order_of(column, values)
       references = column_references([column])
       self.references_values |= references unless references.empty?
 
+      values = values.map { |value| type_caster.type_cast_for_database(column, value) }
       column = order_column(column.to_s) if column.is_a?(Symbol)
 
       spawn.order!(connection.field_ordered_value(column, values))

activerecord/test/cases/relation/field_ordered_values_test.rb

@@ -2,6 +2,7 @@
 
 require "cases/helper"
 require "models/post"
+require "models/book"
 
 class FieldOrderedValuesTest < ActiveRecord::TestCase
   fixtures :posts
@@ -13,6 +14,30 @@ def test_in_order_of
     assert_equal(order, posts.map(&:id))
   end
 
+  def test_in_order_of_with_enums_values
+    Book.destroy_all
+    Book.create!(status: :proposed)
+    Book.create!(status: :written)
+    Book.create!(status: :published)
+
+    order = %w[written published proposed]
+    books = Book.in_order_of(:status, order)
+
+    assert_equal(order, books.map(&:status))
+  end
+
+  def test_in_order_of_with_enums_keys
+    Book.destroy_all
+    Book.create!(status: :proposed)
+    Book.create!(status: :written)
+    Book.create!(status: :published)
+
+    order = [Book.statuses[:written], Book.statuses[:published], Book.statuses[:proposed]]
+    books = Book.in_order_of(:status, order)
+
+    assert_equal(order, books.map { |book| Book.statuses[book.status] })
+  end
+
   def test_in_order_of_expression
     order = [3, 4, 1]
     posts = Post.in_order_of(Arel.sql("id * 2"), order.map { |id| id * 2 }).limit(3)