CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Bug-DBIOWrongParamCountWithCommentBeforeParam' into Feature-AclLoginClassUpdateTokenCheckWithUuidV4

Browse Source
This commit is contained in:
Clemens Schwaighofer
2024-12-10 13:37:43 +09:00
parent 50f83b822c a7742bd5c8
commit 23142a4549
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
4dev/tests/DB/CoreLibsDBIOTest.php
View File

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

2
www/lib/CoreLibs/DB/Support/ConvertPlaceholder.php
View File

@@ -20,7 +20,7 @@ class ConvertPlaceholder
private const PATTERN_QUERY_SPLIT = private const PATTERN_QUERY_SPLIT =
',|' // for ',' mostly in INSERT ',|' // for ',' mostly in INSERT
. '[(<>=]|' // general set for (, <, >, = in any query with any combination . '[(<>=]|' // 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 ^@ . '\^@|' // text search for start from text with ^@
. '\|\||' // concats two elements . '\|\||' // concats two elements
. '&&|' // array overlap . '&&|' // array overlap