Merge #371 - Fixing the additional body tokens issue when create view statements

Ref: phpmyadmin/phpmyadmin#17321
Pull-request: #371

Signed-off-by: William Desportes <[email protected]>

Author: williamdes

src/Statements/CreateStatement.php

@@ -746,6 +746,7 @@ public function parse(Parser $parser, TokensList $list)
                 if ($list->tokens[$nextidx]->value === 'SELECT') {
                     $list->idx = $nextidx;
                     $this->select = new SelectStatement($parser, $list);
+                    ++$list->idx; // Skipping last token from the select.
                 } elseif ($list->tokens[$nextidx]->value === 'WITH') {
                     ++$list->idx;
                     $this->with = new WithStatement($parser, $list);

tests/Builder/CreateStatementTest.php

@@ -342,6 +342,33 @@ public function testBuilderView(): void
             'SELECT id, first_name, FROMzz employee WHERE id = 2  ',
             $stmt->build()
         );
+
+        $parser = new Parser('CREATE VIEW `view_programlevelpartner`  AS SELECT `p`.`country_id`'
+        . 'AS `country_id` FROM `program_level_partner` `p` ORDER BY `p`.`id` asc');
+        $stmt = $parser->statements[0];
+        $this->assertEquals(
+            'CREATE VIEW `view_programlevelpartner`  AS SELECT `p`.`country_id`'
+            . ' AS `country_id` FROM `program_level_partner` AS `p` ORDER BY `p`.`id` ASC ',
+            $stmt->build()
+        );
+
+        $parser = new Parser('CREATE VIEW `view_zg_bycountry`  AS '
+        . 'SELECT `d`.`zg_id` FROM `view_zg_value` AS `d` GROUP BY `d`.`ind_id`;');
+        $stmt = $parser->statements[0];
+        $this->assertEquals(
+            'CREATE VIEW `view_zg_bycountry`  AS '
+            . 'SELECT `d`.`zg_id` FROM `view_zg_value` AS `d` GROUP BY `d`.`ind_id` ',
+            $stmt->build()
+        );
+
+        $parser = new Parser('CREATE view view_name AS WITH  aa(col1)'
+        . ' AS ( SELECT 1 UNION ALL SELECT 2 ) SELECT col1 FROM cte AS `d` ');
+        $stmt = $parser->statements[0];
+        $this->assertEquals(
+            'CREATE view view_name  AS WITH aa(col1)'
+            . ' AS (SELECT 1 UNION ALL SELECT 2) SELECT col1 FROM cte AS `d`  ',
+            $stmt->build()
+        );
     }
 
     public function testBuilderViewComplex(): void

tests/data/parser/parseCreateView.out

@@ -3534,11 +3534,7 @@
                 "table": null,
                 "return": null,
                 "parameters": null,
-                "body": [
-                    {
-                        "@type": "@286"
-                    }
-                ],
+                "body": [],
                 "CLAUSES": [],
                 "END_OPTIONS": [],
                 "options": {

tests/data/parser/parseCreateView3.out

@@ -1171,9 +1171,6 @@
                 "return": null,
                 "parameters": null,
                 "body": [
-                    {
-                        "@type": "@28"
-                    },
                     {
                         "@type": "@29"
                     },

tests/data/parser/parseCreateViewWithQuotes.out

@@ -1223,11 +1223,7 @@
                 "table": null,
                 "return": null,
                 "parameters": null,
-                "body": [
-                    {
-                        "@type": "@43"
-                    }
-                ],
+                "body": [],
                 "CLAUSES": [],
                 "END_OPTIONS": [],
                 "options": {

tests/data/parser/parseCreateViewWithUnion.out

@@ -1266,9 +1266,6 @@
                 "return": null,
                 "parameters": null,
                 "body": [
-                    {
-                        "@type": "@27"
-                    },
                     {
                         "@type": "@28"
                     },

tests/data/parser/parseCreateViewWithWrongSyntax.out

@@ -1007,11 +1007,7 @@
                 "table": null,
                 "return": null,
                 "parameters": null,
-                "body": [
-                    {
-                        "@type": "@20"
-                    }
-                ],
+                "body": [],
                 "CLAUSES": [],
                 "END_OPTIONS": [],
                 "options": {

tests/data/parser/parseCreateViewWithoutQuotes.out

@@ -1232,11 +1232,7 @@
                 "table": null,
                 "return": null,
                 "parameters": null,
-                "body": [
-                    {
-                        "@type": "@44"
-                    }
-                ],
+                "body": [],
                 "CLAUSES": [],
                 "END_OPTIONS": [],
                 "options": {