kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Remove requirement that query ends with comments

Browse source 
For the SQL Server adapter
(https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/) the
tests in QueryLogsTest need to be coerced and re-implemented
(https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/972) because the tests
are expecting the SQL to end with the comment but the SQL generated by the
SQL Server adapter ends with prepare statement bindings. This PR just
removes the end of string check in the regular expressions.

These changes do not affect the purpose of the tests and removes the
need coerce & re-implement the same tests in the SQL Server adapter.
This commit is contained in:
Matias Grunberg 2022-01-03 10:17:21 -03:00
parent 3a2e361457
commit 990af3d203
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
activerecord/test/cases/query_logs_test.rb
View file

@ -151,7 +151,7 @@ class QueryLogsTest < ActiveRecord::TestCase
def test_custom_basic_tags
ActiveRecord::QueryLogs.tags = [ :application, { custom_string: "test content" } ]
assert_sql(%r{/\*application:active_record,custom_string:test content\*/$}) do
assert_sql(%r{/\*application:active_record,custom_string:test content\*/}) do
Dashboard.first
end
end
@ -159,7 +159,7 @@ class QueryLogsTest < ActiveRecord::TestCase
def test_custom_proc_tags
ActiveRecord::QueryLogs.tags = [ :application, { custom_proc: -> { "test content" } } ]
assert_sql(%r{/\*application:active_record,custom_proc:test content\*/$}) do
assert_sql(%r{/\*application:active_record,custom_proc:test content\*/}) do
Dashboard.first
end
end
@ -170,7 +170,7 @@ class QueryLogsTest < ActiveRecord::TestCase
{ custom_proc: -> { "test content" }, another_proc: -> { "more test content" } },
]
assert_sql(%r{/\*application:active_record,custom_proc:test content,another_proc:more test content\*/$}) do
assert_sql(%r{/\*application:active_record,custom_proc:test content,another_proc:more test content\*/}) do
Dashboard.first
end
end
@ -179,7 +179,7 @@ class QueryLogsTest < ActiveRecord::TestCase
ActiveSupport::ExecutionContext[:foo] = "bar"
ActiveRecord::QueryLogs.tags = [ :application, { custom_context_proc: ->(context) { context[:foo] } } ]
assert_sql(%r{/\*application:active_record,custom_context_proc:bar\*/$}) do
assert_sql(%r{/\*application:active_record,custom_context_proc:bar\*/}) do
Dashboard.first
end
end