Fix way end of functions, procedures and triggers' bodies is identified

phpmyadmin · Apr 14, 2023 · 0ebfa9c · 0ebfa9c
1 parent d576334
commit 0ebfa9c
Show file tree

Hide file tree

Showing 14 changed files with 432 additions and 2,218 deletions.
diff --git a/src/Statements/CreateStatement.php b/src/Statements/CreateStatement.php
@@ -718,6 +718,10 @@ public function parse(Parser $parser, TokensList $list)
 
             for (; $list->idx < $list->count; ++$list->idx) {
                 $token = $list->tokens[$list->idx];
+                if ($token->type === Token::TYPE_DELIMITER) {
+                    break;
+                }
+
                 $this->body[] = $token;
             }
         } elseif ($this->options->has('VIEW')) {
@@ -781,6 +785,10 @@ public function parse(Parser $parser, TokensList $list)
 
             for (; $list->idx < $list->count; ++$list->idx) {
                 $token = $list->tokens[$list->idx];
+                if ($token->type === Token::TYPE_DELIMITER) {
+                    break;
+                }
+
                 $this->body[] = $token;
             }
         } else {

diff --git a/tests/Builder/CreateStatementTest.php b/tests/Builder/CreateStatementTest.php
@@ -520,7 +520,8 @@ public function testBuilderCreateProcedure(): void
     public function testBuilderCreateFunction(): void
     {
         $parser = new Parser(
-            'CREATE DEFINER=`root`@`localhost`'
+            'DELIMITER $$' . "\n"
+            . 'CREATE DEFINER=`root`@`localhost`'
             . ' FUNCTION `inventory_in_stock`(`p_inventory_id` INT) RETURNS tinyint(1)'
             . ' READS SQL DATA'
             . ' COMMENT \'My best function written by a friend\'\'s friend\''
@@ -663,6 +664,7 @@ public function testBuilderTrigger(): void
     public function testBuilderRoutine(): void
     {
         $parser = new Parser(
+            'DELIMITER $$' . "\n" .
             'CREATE FUNCTION test (IN `i` INT) RETURNS VARCHAR ' .
             'BEGIN ' .
             'DECLARE name VARCHAR DEFAULT ""; ' .

diff --git a/tests/Parser/ParserLongExportsTest.php b/tests/Parser/ParserLongExportsTest.php
@@ -89,6 +89,9 @@ public function testParsephpMyAdminDump(): void
             'SET  @OLD_CHARACTER_SET_RESULTS = @@CHARACTER_SET_RESULTS',
             'SET  @OLD_COLLATION_CONNECTION = @@COLLATION_CONNECTION',
             'SET NAMES utf8mb4',
+            'SET  CHARACTER_SET_CLIENT = @OLD_CHARACTER_SET_CLIENT',
+            'SET  CHARACTER_SET_RESULTS = @OLD_CHARACTER_SET_RESULTS',
+            'SET  COLLATION_CONNECTION = @OLD_COLLATION_CONNECTION',
         ], $collectedSetStatements);
 
         foreach ($parser->statements as $stmt) {

diff --git a/tests/data/parser/parseCreateFunction.in b/tests/data/parser/parseCreateFunction.in
@@ -1,3 +1,4 @@
+DELIMITER $$
 CREATE FUNCTION F_TEST(uid INT) RETURNS VARCHAR
 BEGIN
     DECLARE username VARCHAR DEFAULT "";