Merge pull request rails#51551 from ngan/fix-sqlcommenter-key-sort

Allow string keys for SQLCommenter

Author: rafaelfranca

activerecord/lib/active_record/query_logs_formatter.rb

@@ -28,7 +28,7 @@ def initialize
       end
 
       def format(pairs)
-        pairs.sort_by!(&:first)
+        pairs.sort_by! { |pair| pair.first.to_s }
         super
       end
 

activerecord/test/cases/query_logs_test.rb

@@ -229,6 +229,23 @@ def test_sqlcommenter_format_value
     end
   end
 
+  def test_sqlcommenter_format_allows_string_keys
+    ActiveRecord::QueryLogs.update_formatter(:sqlcommenter)
+
+    ActiveRecord::QueryLogs.tags = [
+      :application,
+      {
+        "string" => "value",
+        tracestate: "congo=t61rcWkgMzE,rojo=00f067aa0ba902b7",
+        custom_proc: -> { "Joe's Shack" }
+      },
+    ]
+
+    assert_queries_match(%r{custom_proc='Joe%27s%20Shack',tracestate='congo%3Dt61rcWkgMzE%2Crojo%3D00f067aa0ba902b7',string='value'\*/}) do
+      Dashboard.first
+    end
+  end
+
   def test_sqlcommenter_format_value_string_coercible
     ActiveRecord::QueryLogs.update_formatter(:sqlcommenter)