Merge pull request rails#54278 from zzak/re-54244

Make payload[:name] of eager loading `sql.active_record` to "#{model.name} Eager Load".

Author: rafaelfranca

activerecord/CHANGELOG.md

@@ -1,3 +1,8 @@
+*   Change the payload name of `sql.active_record` notification for eager
+    loading from "SQL" to "#{model.name} Eager Load".
+
+    *zzak*
+
 *   Enable automatically retrying idempotent `#exists?` queries on connection
     errors.
 

activerecord/lib/active_record/relation.rb

@@ -1452,7 +1452,7 @@ def exec_main_query(async: false)
                 else
                   relation = join_dependency.apply_column_aliases(relation)
                   @_join_dependency = join_dependency
-                  c.select_all(relation.arel, "SQL", async: async)
+                  c.select_all(relation.arel, "#{model.name} Eager Load", async: async)
                 end
               end
             end

activerecord/test/cases/instrumentation_test.rb

@@ -43,6 +43,11 @@ def test_payload_name_on_update_all
       assert_equal "Book Update All", notification.payload[:name]
     end
 
+    def test_payload_name_on_eager_load
+      notification = capture_notifications("sql.active_record") { Book.eager_load(:author).to_a }
+      assert_equal "Book Eager Load", notification.first.payload[:name]
+    end
+
     def test_payload_name_on_destroy
       book = Book.create(name: "test book")
 

activerecord/test/cases/relation/load_async_test.rb

@@ -163,7 +163,7 @@ def test_eager_loading_query
       status = {}
 
       subscriber = ActiveSupport::Notifications.subscribe("sql.active_record") do |event|
-        if event.payload[:name] == "SQL"
+        if event.payload[:name] == "Post Eager Load"
           status[:executed] = true
           status[:async] = event.payload[:async]
         end
@@ -444,7 +444,7 @@ def test_eager_loading_query
 
         status = {}
         subscriber = ActiveSupport::Notifications.subscribe("sql.active_record") do |event|
-          if event.payload[:name] == "SQL"
+          if event.payload[:name] == "Post Eager Load"
             status[:executed] = true
             status[:async] = event.payload[:async]
           end