Add more complex create view statements

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

Author: williamdes

tests/Builder/CreateStatementTest.php

@@ -328,6 +328,70 @@ public function testBuilderView()
         );
     }
 
+    public function testBuilderViewComplex()
+    {
+        $parser = new Parser(
+            'CREATE VIEW withclause AS' . "\n"
+            . "\n"
+            . 'WITH cte AS (' . "\n"
+                . 'SELECT p.name, p.shape' . "\n"
+                . 'FROM gis_all as p' . "\n"
+            . ')' . "\n"
+            . "\n"
+            . 'SELECT cte.*' . "\n"
+            . 'FROM cte' . "\n"
+            . 'CROSS JOIN gis_all;'
+        );
+        $stmt = $parser->statements[0];
+
+        $this->assertEquals(
+            'CREATE VIEW withclause  AS ' . "\n"
+            . "\n"
+            . 'WITH cte AS (' . "\n"
+                . 'SELECT p.name, p.shape' . "\n"
+                . 'FROM gis_all as p' . "\n"
+            . ')' . "\n"
+            . "\n"
+            . 'SELECT cte.*' . "\n"
+            . 'FROM cte' . "\n"
+            . 'CROSS JOIN gis_all ',
+            $stmt->build()
+        );
+        $parser = new Parser(
+            'CREATE VIEW withclause2 AS' . "\n"
+            . "\n"
+            . 'WITH cte AS (' . "\n"
+                . "\t" . 'SELECT p.name, p.shape' . "\n"
+                . "\t" . 'FROM gis_all as p' . "\n"
+            . '), cte2 AS (' . "\n"
+                . "\t" . 'SELECT p.name as n2, p.shape as sh2' . "\n"
+                . "\t" . 'FROM gis_all as p' . "\n"
+            . ')' . "\n"
+            . "\n"
+            . 'SELECT cte.*,cte2.*' . "\n"
+            . 'FROM cte,cte2' . "\n"
+            . 'CROSS JOIN gis_all;'
+        );
+        $stmt = $parser->statements[0];
+
+        $this->assertEquals(
+            'CREATE VIEW withclause2  AS ' . "\n"
+            . "\n"
+            . 'WITH cte AS (' . "\n"
+                . "\t" . 'SELECT p.name, p.shape' . "\n"
+                . "\t" . 'FROM gis_all as p' . "\n"
+            . '), cte2 AS (' . "\n"
+                . "\t" . 'SELECT p.name as n2, p.shape as sh2' . "\n"
+                . "\t" . 'FROM gis_all as p' . "\n"
+            . ')' . "\n"
+            . "\n"
+            . 'SELECT cte.*,cte2.*' . "\n"
+            . 'FROM cte,cte2' . "\n"
+            . 'CROSS JOIN gis_all ',
+            $stmt->build()
+        );
+    }
+
     public function testBuilderTrigger()
     {
         $stmt = new CreateStatement();

tests/Parser/CreateStatementTest.php

@@ -57,6 +57,7 @@ public function createProvider()
             array('parser/parseCreateViewWithQuotes'),
             array('parser/parseCreateViewWithWrongSyntax'),
             array('parser/parseCreateViewWithUnion'),
+            array('parser/parseCreateViewAsWithAs'),
         );
     }
 }

tests/data/parser/parseCreateViewAsWithAs.in

@@ -0,0 +1,25 @@
+-- create first view
+CREATE VIEW withclause AS
+
+WITH cte AS (
+  SELECT p.name, p.shape
+  FROM gis_all as p
+)
+
+SELECT cte.*
+FROM cte
+CROSS JOIN gis_all;
+-- create second view
+CREATE VIEW withclause2 AS
+
+WITH cte AS (
+  SELECT p.name, p.shape
+  FROM gis_all as p
+), 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;