Skip to content
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

Jump to bottom

Simplify regex detecting comments in sql query #45237

Merged
merged 1 commit into from Jun 2, 2022
Merged

Simplify regex detecting comments in sql query #45237

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ class AbstractAdapter
include Savepoints

SIMPLE_INT = /\A\d+\z/
COMMENT_REGEX = %r{(?:--.*\n)|/\*(?:[^*]|\*[^/])*\*/}m
COMMENT_REGEX = %r{(?:--.*\n)|/\*(?:[^*]|\*[^/])*\*/}

attr_accessor :pool
attr_reader :visitor, :owner, :logger, :lock
Expand Down
10 changes: 10 additions & 0 deletions activerecord/test/cases/adapter_prevent_writes_test.rb
View file
Open in desktop
Expand Up @@ -127,6 +127,16 @@ def test_errors_when_an_insert_query_prefixed_by_a_double_dash_comment_is_called
end
end

def test_errors_when_an_insert_query_prefixed_by_a_multiline_double_dash_comment_is_called_while_preventing_writes
ActiveRecord::Base.while_preventing_writes do
assert_raises(ActiveRecord::ReadOnlyError) do
Timeout.timeout(0.1) do # should be fast to parse the query
@connection.insert("#{"-- comment\n" * 50}INSERT INTO subscribers(nick) VALUES ('138853948594')", nil, false)
end
end
end
end

def test_errors_when_an_insert_query_prefixed_by_a_slash_star_comment_containing_read_command_is_called_while_preventing_writes
ActiveRecord::Base.while_preventing_writes do
assert_raises(ActiveRecord::ReadOnlyError) do
Expand Down