Update the with Build statement to build the cteStatement

Signed-off-by: Fawzi E. Abdulfattah <[email protected]>
phpmyadmin · Dec 7, 2021 · f1585a9 · f1585a9
1 parent cd49677
commit f1585a9
Show file tree

Hide file tree

Showing 20 changed files with 6,869 additions and 7 deletions.
diff --git a/src/Statements/WithStatement.php b/src/Statements/WithStatement.php
@@ -60,6 +60,13 @@ final class WithStatement extends Statement
     /** @var WithKeyword[] */
     public $withers = [];
 
+    /**
+     * holds the CTE parser.
+     *
+     * @var Parser
+     */
+    public $cteStatementParser;
+
     /**
      * @param Parser     $parser the instance that requests parsing
      * @param TokensList $list   the list of tokens to be parsed
@@ -243,8 +250,12 @@ public function parse(Parser $parser, TokensList $list)
                     foreach ($subParser->errors as $error) {
                         $parser->errors[] = $error;
                     }
+
+                    break;
                 }
 
+                $this->cteStatementParser = $subParser;
+
                 $list->idx = $idxOfLastParsedToken;
                 break;
             }
@@ -277,6 +288,12 @@ public function build()
             $str .= WithKeyword::build($wither);
         }
 
+        $str .= ' ';
+
+        foreach ($this->cteStatementParser->statements as $statement) {
+            $str .= $statement->build();
+        }
+
         return $str;
     }
 

diff --git a/tests/Builder/CreateStatementTest.php b/tests/Builder/CreateStatementTest.php
@@ -175,7 +175,8 @@ public function testBuilderTable(): void
 
         $this->assertEquals(
             'CREATE TABLE table_name WITH' .
-            ' cte(col1) AS (SELECT 1 UNION ALL SELECT 2)',
+            ' cte(col1) AS (SELECT 1 UNION ALL SELECT 2)' .
+            ' SELECT col1 FROM cte',
             $stmt->build()
         );
     }
@@ -370,9 +371,12 @@ public function testBuilderViewComplex(): void
         $this->assertEquals(
             'CREATE VIEW withclause  AS '
             . 'WITH cte AS ('
-                . 'SELECT p.name, p.shape'
-                . ' FROM gis_all AS `p`'
-            . ') ',
+                . 'SELECT p.name, p.shape '
+                . 'FROM gis_all AS `p`'
+            . ') '
+            . 'SELECT cte.* '
+            . 'FROM cte '
+            . 'CROSS JOIN gis_all ',
             $stmt->build()
         );
         $parser = new Parser(
@@ -400,7 +404,10 @@ public function testBuilderViewComplex(): void
             . '), cte2 AS ('
                 . 'SELECT p.name AS `n2`, p.shape AS `sh2`'
                 . ' FROM gis_all AS `p`'
-            . ') ',
+            . ')'
+            . ' SELECT cte.*, cte2.* '
+            . 'FROM cte, cte2'
+            . ' CROSS JOIN gis_all ',
             $stmt->build()
         );
     }

diff --git a/tests/Parser/WithStatementTest.php b/tests/Parser/WithStatementTest.php
@@ -68,7 +68,7 @@ public function testWith(): void
 
         // phpcs:disable Generic.Files.LineLength.TooLong
         $expected = <<<SQL
-WITH categories(identifier, name, parent_id) AS (SELECT c.identifier, c.name, c.parent_id FROM category AS `c` WHERE c.identifier = 'a' UNION ALL SELECT c.identifier, c.name, c.parent_id FROM categories, category AS `c` WHERE c.identifier = categories.parent_id), foo AS (SELECT * FROM test)
+WITH categories(identifier, name, parent_id) AS (SELECT c.identifier, c.name, c.parent_id FROM category AS `c` WHERE c.identifier = 'a' UNION ALL SELECT c.identifier, c.name, c.parent_id FROM categories, category AS `c` WHERE c.identifier = categories.parent_id), foo AS (SELECT * FROM test) SELECT * FROM categories
 SQL;
         // phpcs:enable
         $this->assertEquals($expected, $parser->statements[0]->build());
@@ -110,7 +110,7 @@ public function testWithEmbedParenthesis(): void
 
         // phpcs:disable Generic.Files.LineLength.TooLong
         $expected = <<<SQL
-WITH categories AS (SELECT * FROM (SELECT * FROM foo))
+WITH categories AS (SELECT * FROM (SELECT * FROM foo)) SELECT * FROM categories
 SQL;
         // phpcs:enable
         $this->assertEquals($expected, $parser->statements[0]->build());

diff --git a/tests/data/parser/parseCreateViewAsWithAs.out b/tests/data/parser/parseCreateViewAsWithAs.out
diff --git a/tests/data/parser/parseWithStatement.out b/tests/data/parser/parseWithStatement.out
diff --git a/tests/data/parser/parseWithStatement1.out b/tests/data/parser/parseWithStatement1.out
diff --git a/tests/data/parser/parseWithStatement2.out b/tests/data/parser/parseWithStatement2.out
diff --git a/tests/data/parser/parseWithStatement3.out b/tests/data/parser/parseWithStatement3.out
diff --git a/tests/data/parser/parseWithStatement4.out b/tests/data/parser/parseWithStatement4.out
@@ -1653,6 +1653,7 @@
                             }
                         }
                     },
+                    "cteStatementParser": null,
                     "END_OPTIONS": [],
                     "options": {
                         "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray",

diff --git a/tests/data/parser/parseWithStatement5.out b/tests/data/parser/parseWithStatement5.out