Merge pull request rails#43078 from Shopify/ar-query-log-default-context

Make ActiveRecord::QueryLogs default behavior to return the context content

Author: byroot

activerecord/lib/active_record/query_logs.rb

@@ -176,7 +176,7 @@ def tag_content
             key, value_input = tag
 
             val = case value_input
-                  when nil then tag_value(key) if taggings.has_key? key
+                  when nil then tag_value(key)
                   when Proc then instance_exec(&value_input)
                   else value_input
             end
@@ -186,12 +186,14 @@ def tag_content
         end
 
         def tag_value(key)
-          value = taggings[key]
-
-          if value.respond_to?(:call)
-            instance_exec(&taggings[key])
+          if value = taggings[key]
+            if value.respond_to?(:call)
+              instance_exec(&taggings[key])
+            else
+              value
+            end
           else
-            value
+            context[key]
           end
         end
 

activerecord/test/cases/query_logs_test.rb

@@ -137,6 +137,18 @@ def test_ensure_context_has_symbol_keys
     ActiveRecord::QueryLogs.update_context(application_name: nil)
   end
 
+  def test_default_tag_behavior
+    ActiveRecord::QueryLogs.tags = [:application, :foo]
+    ActiveRecord::QueryLogs.set_context(foo: "bar") do
+      assert_sql(%r{/\*application:active_record,foo:bar\*/}) do
+        Dashboard.first
+      end
+    end
+    assert_sql(%r{/\*application:active_record\*/}) do
+      Dashboard.first
+    end
+  end
+
   def test_inline_tags_only_affect_block
     # disable regular comment tags
     ActiveRecord::QueryLogs.tags = []