Merge pull request rails#46642 from ghiculescu/query-logs-controller-namespace-double-up

Fix more double logging in `ActiveRecord::QueryLogs`

Author: byroot

actionpack/CHANGELOG.md

@@ -2,10 +2,11 @@
 
     *Andy Waite*
 
-*   Don't double log the `controller` or `action` when using `ActiveRecord::QueryLog`
+*   Don't double log the `controller`, `action`, or `namespaced_controller` when using `ActiveRecord::QueryLog`
 
     Previously if you set `config.active_record.query_log_tags` to an array that included
-    `:controller` or `:action`, that item would get logged twice. This bug has been fixed.
+    `:controller`, `:namespaced_controller`, or `:action`, that item would get logged twice.
+    This bug has been fixed.
 
     *Alex Ghiculescu*
 

actionpack/lib/action_controller/railtie.rb

@@ -116,7 +116,8 @@ class Railtie < Rails::Railtie # :nodoc:
         app.config.action_controller.log_query_tags_around_actions
 
       if query_logs_tags_enabled
-        app.config.active_record.query_log_tags |= [:controller, :action]
+        app.config.active_record.query_log_tags |= [:controller] unless app.config.active_record.query_log_tags.include?(:namespaced_controller)
+        app.config.active_record.query_log_tags |= [:action]
 
         ActiveSupport.on_load(:active_record) do
           ActiveRecord::QueryLogs.taggings.merge!(

railties/test/application/query_logs_test.rb

@@ -127,6 +127,18 @@ def app
       assert_match(/\/\*action='index',controller='users',pid='\d+'\*\//, comment)
     end
 
+    test "namespace controller tags are not doubled up if already configured" do
+      add_to_config "config.active_record.query_log_tags_enabled = true"
+      add_to_config "config.active_record.query_log_tags = [ :action, :job, :namespaced_controller, :pid ]"
+
+      boot_app
+
+      get "/"
+      comment = last_response.body.strip
+
+      assert_match(/\/\*action='index',namespaced_controller='UsersController',pid='\d+'\*\//, comment)
+    end
+
     test "job perform method has tagging filters enabled by default" do
       add_to_config "config.active_record.query_log_tags_enabled = true"