Skip to content

bug fix: multiline queries do not raise error when explained #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
metaskills merged 1 commit into from
Aug 12, 2012
Merged

bug fix: multiline queries do not raise error when explained #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def unprepare_sqlserver_statement(sql)
executesql_args = executesql.split(', ')
found_args = executesql_args.reject! { |arg| arg =~ SQLSERVER_PARAM_MATCHER }
executesql_args.pop if found_args && executesql_args.many?
executesql = executesql_args.join(', ').strip.match(/N'(.*)'/)[1]
executesql = executesql_args.join(', ').strip.match(/N'(.*)'/m)[1]
Utils.unquote_string(executesql)
else
sql
Expand Down
6 changes: 6 additions & 0 deletions test/cases/showplan_test_sqlserver.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ class ShowplanTestSqlserver < ActiveRecord::TestCase
assert plan.starts_with?("EXPLAIN for: SELECT [cars].* FROM [cars] WHERE [cars].[id] = 1")
assert plan.include?("Clustered Index Seek"), 'make sure we do not showplan the sp_executesql'
end

should 'from multiline statement' do
plan = Car.where("\n id = 1 \n").explain
assert plan.starts_with?("EXPLAIN for: SELECT [cars].* FROM [cars] WHERE (\n id = 1 \n)")
assert plan.include?("Clustered Index Seek"), 'make sure we do not showplan the sp_executesql'
end

should 'from prepared statement' do
plan = capture_logger do
Expand Down