Merge pull request rails#51554 from ngan/patch-1

rafaelfranca · web-flow · commit 20fe00d8abfc · 2024-04-11T20:47:47.000-03:00
Fix query_logs_test.rb
diff --git a/activerecord/test/cases/query_logs_test.rb b/activerecord/test/cases/query_logs_test.rb
@@ -241,7 +241,7 @@ def test_sqlcommenter_format_allows_string_keys
       },
     ]
 
-    assert_queries_match(%r{custom_proc='Joe%27s%20Shack',tracestate='congo%3Dt61rcWkgMzE%2Crojo%3D00f067aa0ba902b7',string='value'\*/}) do
+    assert_queries_match(%r{custom_proc='Joe%27s%20Shack',string='value',tracestate='congo%3Dt61rcWkgMzE%2Crojo%3D00f067aa0ba902b7'\*/}) do
       Dashboard.first
     end
   end

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ def test_sqlcommenter_format_allows_string_keys`
`241`	`241`	`},`
`242`	`242`	`]`
`243`	`243`
`244`		`- assert_queries_match(%r{custom_proc='Joe%27s%20Shack',tracestate='congo%3Dt61rcWkgMzE%2Crojo%3D00f067aa0ba902b7',string='value'\*/}) do`
	`244`	`+ assert_queries_match(%r{custom_proc='Joe%27s%20Shack',string='value',tracestate='congo%3Dt61rcWkgMzE%2Crojo%3D00f067aa0ba902b7'\*/}) do`
`245`	`245`	`Dashboard.first`
`246`	`246`	`end`
`247`	`247`	`end`