Skip to content

Commit 9ff553f

Browse files
committed
Merge #438 - Fix way end of functions, procedures and triggers' bodies is identified
Pull-request: #438 Signed-off-by: William Desportes <williamdes@wdes.fr>
2 parents d576334 + 599c597 commit 9ff553f

14 files changed

+833
-872
lines changed

src/Statements/CreateStatement.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,10 @@ public function parse(Parser $parser, TokensList $list)
718718

719719
for (; $list->idx < $list->count; ++$list->idx) {
720720
$token = $list->tokens[$list->idx];
721+
if ($token->type === Token::TYPE_DELIMITER) {
722+
break;
723+
}
724+
721725
$this->body[] = $token;
722726
}
723727
} elseif ($this->options->has('VIEW')) {
@@ -781,6 +785,10 @@ public function parse(Parser $parser, TokensList $list)
781785

782786
for (; $list->idx < $list->count; ++$list->idx) {
783787
$token = $list->tokens[$list->idx];
788+
if ($token->type === Token::TYPE_DELIMITER) {
789+
break;
790+
}
791+
784792
$this->body[] = $token;
785793
}
786794
} else {

tests/Builder/CreateStatementTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,8 @@ public function testBuilderCreateProcedure(): void
520520
public function testBuilderCreateFunction(): void
521521
{
522522
$parser = new Parser(
523-
'CREATE DEFINER=`root`@`localhost`'
523+
'DELIMITER $$' . "\n"
524+
. 'CREATE DEFINER=`root`@`localhost`'
524525
. ' FUNCTION `inventory_in_stock`(`p_inventory_id` INT) RETURNS tinyint(1)'
525526
. ' READS SQL DATA'
526527
. ' COMMENT \'My best function written by a friend\'\'s friend\''
@@ -663,6 +664,7 @@ public function testBuilderTrigger(): void
663664
public function testBuilderRoutine(): void
664665
{
665666
$parser = new Parser(
667+
'DELIMITER $$' . "\n" .
666668
'CREATE FUNCTION test (IN `i` INT) RETURNS VARCHAR ' .
667669
'BEGIN ' .
668670
'DECLARE name VARCHAR DEFAULT ""; ' .

tests/Parser/ParserLongExportsTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@ public function testParsephpMyAdminDump(): void
8989
'SET @OLD_CHARACTER_SET_RESULTS = @@CHARACTER_SET_RESULTS',
9090
'SET @OLD_COLLATION_CONNECTION = @@COLLATION_CONNECTION',
9191
'SET NAMES utf8mb4',
92+
'SET CHARACTER_SET_CLIENT = @OLD_CHARACTER_SET_CLIENT',
93+
'SET CHARACTER_SET_RESULTS = @OLD_CHARACTER_SET_RESULTS',
94+
'SET COLLATION_CONNECTION = @OLD_COLLATION_CONNECTION',
9295
], $collectedSetStatements);
9396

9497
foreach ($parser->statements as $stmt) {

tests/data/parser/parseCreateFunction.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
DELIMITER $$
12
CREATE FUNCTION F_TEST(uid INT) RETURNS VARCHAR
23
BEGIN
34
DECLARE username VARCHAR DEFAULT "";

0 commit comments

Comments
 (0)