Merge branch 'Bug-DBIOWrongParamCountWithCommentBeforeParam' into Feature-AclLoginClassUpdateTokenCheckWithUuidV4

4dev/tests/DB/CoreLibsDBIOTest.php

@@ -5141,11 +5141,11 @@ final class CoreLibsDBIOTest extends TestCase
 				INSERT INTO table_with_primary_key (
 					row_int, row_numeric, row_varchar, row_varchar_literal
 				) VALUES (
-					-- comment
+					-- comment 1
 					$1, $2,
-					-- comment
+					-- comment 2
 					$3
-					-- comment
+					-- comment 3
 					, $4
 				)
 				SQL,

www/lib/CoreLibs/DB/Support/ConvertPlaceholder.php

@@ -20,7 +20,7 @@ class ConvertPlaceholder
 	private const PATTERN_QUERY_SPLIT =
 		',|' // for ',' mostly in INSERT
 		. '[(<>=]|' // general set for (, <, >, = in any query with any combination
-		. '(?:[\(,]\s*\-\-\s*\w*)\r?\n|' // a comment that starts after a ( or ,
+		. '(?:[\(,]\s*\-\-[\s\w]*)\r?\n|' // a comment that starts after a ( or ,
 		. '\^@|' // text search for start from text with ^@
 		. '\|\||' // concats two elements
 		. '&&|' // array overlap