Merge pull request #45237 from fatkodima/comments-query-regex

Simplify regex detecting comments in sql query
rails · Jun 2, 2022 · 16c0026 · 16c0026
2 parents ec0c6c7 + a482239
commit 16c0026
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -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

diff --git a/activerecord/test/cases/adapter_prevent_writes_test.rb b/activerecord/test/cases/adapter_prevent_writes_test.rb
@@ -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