Improved test coverage.

Author: udan11

src/Components/Expression.php

@@ -230,8 +230,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                             break;
                         }
                     } elseif ($brackets < 0) {
-                        $parser->error(__('Unexpected closing bracket.'), $token);
-                        $brackets = 0;
+                        // $parser->error(__('Unexpected closing bracket.'), $token);
+                        // $brackets = 0;
+                        break;
                     }
                 } elseif ($token->value === ',') {
                     if ($brackets === 0) {

src/Parser.php

@@ -152,7 +152,7 @@ class Parser
         'FROM'                  => array(
             'class'             => 'SqlParser\\Components\\ExpressionArray',
             'field'             => 'from',
-            'options'           => array('skipColumn' => true, 'noBrackets' => true),
+            'options'           => array('skipColumn' => true),
         ),
         'GROUP BY'              => array(
             'class'             => 'SqlParser\\Components\\OrderKeyword',

tests/Builder/CreateStatementTest.php

@@ -15,11 +15,16 @@
 class CreateStatementTest extends TestCase
 {
 
-    public function testBuilderNull()
+    public function testBuilder()
     {
-        $stmt = new CreateStatement();
-        $stmt->options = new OptionsArray();
-        $this->assertEquals('', $stmt->build());
+        $parser = new Parser(
+            'CREATE USER "jeffrey"@"localhost" IDENTIFIED BY "mypass"'
+        );
+        $stmt = $parser->statements[0];
+        $this->assertEquals(
+            'CREATE USER "jeffrey"@"localhost" IDENTIFIED BY "mypass"',
+            $stmt->build()
+        );
     }
 
     public function testBuilderDatabase()

tests/Builder/InsertStatementTest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace SqlParser\Tests\Builder;
+
+use SqlParser\Parser;
+
+use SqlParser\Tests\TestCase;
+
+class InsertStatementTest extends TestCase
+{
+
+    public function testBuilder()
+    {
+        $parser = new Parser(
+            'INSERT INTO tbl(col1, col2, col3) VALUES (1, "str", 3.14)'
+        );
+        $stmt = $parser->statements[0];
+        $this->assertEquals(
+            'INSERT  INTO tbl(col1, col2, col3) VALUES (1, "str", 3.14)',
+            $stmt->build()
+        );
+    }
+}

tests/Components/ExpressionTest.php

@@ -35,10 +35,12 @@ public function testParseErr($expr, $error)
     public function testParseErrProvider()
     {
         return array(
+            /*
             array(
                 '(1))',
                 'Unexpected closing bracket.',
             ),
+            */
             array(
                 'tbl..col',
                 'Unexpected dot.',

tests/Parser/ParserTest.php

@@ -24,6 +24,7 @@ public function testParseProvider()
     {
         return array(
             array('parser/parse'),
+            array('parser/parse2'),
             array('parser/parseDelimiter'),
         );
     }

tests/Utils/MiscTest.php

@@ -24,6 +24,11 @@ public function testGetAliases($query, $db, array $expected)
     public function getAliasesProvider()
     {
         return array(
+            array(
+                'select * from (select 1) tbl',
+                'mydb',
+                array(),
+            ),
             array(
                 'select i.name as `n`,abcdef gh from qwerty i',
                 'mydb',

tests/data/parser/parse2.in

@@ -0,0 +1 @@
+(SELECT 1);((SELECT 2));

tests/data/parser/parse2.out

@@ -0,0 +1 @@
+a:4:{s:5:"query";s:24:"(SELECT 1);((SELECT 2));";s:5:"lexer";O:15:"SqlParser\Lexer":8:{s:6:"strict";b:0;s:3:"str";s:24:"(SELECT 1);((SELECT 2));";s:3:"len";i:24;s:4:"last";i:24;s:4:"list";O:20:"SqlParser\TokensList":3:{s:6:"tokens";a:15:{i:0;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"(";s:5:"value";s:1:"(";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:0;}i:1;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"SELECT";s:5:"value";s:6:"SELECT";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:1;}i:2;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:7;}i:3;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"1";s:5:"value";i:1;s:4:"type";i:6;s:5:"flags";i:0;s:8:"position";i:8;}i:4;O:15:"SqlParser\Token":5:{s:5:"token";s:1:")";s:5:"value";s:1:")";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:9;}i:5;O:15:"SqlParser\Token":5:{s:5:"token";s:1:";";s:5:"value";s:1:";";s:4:"type";i:9;s:5:"flags";i:0;s:8:"position";i:10;}i:6;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"(";s:5:"value";s:1:"(";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:11;}i:7;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"(";s:5:"value";s:1:"(";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:12;}i:8;O:15:"SqlParser\Token":5:{s:5:"token";s:6:"SELECT";s:5:"value";s:6:"SELECT";s:4:"type";i:1;s:5:"flags";i:3;s:8:"position";i:13;}i:9;O:15:"SqlParser\Token":5:{s:5:"token";s:1:" ";s:5:"value";s:1:" ";s:4:"type";i:3;s:5:"flags";i:0;s:8:"position";i:19;}i:10;O:15:"SqlParser\Token":5:{s:5:"token";s:1:"2";s:5:"value";i:2;s:4:"type";i:6;s:5:"flags";i:0;s:8:"position";i:20;}i:11;O:15:"SqlParser\Token":5:{s:5:"token";s:1:")";s:5:"value";s:1:")";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:21;}i:12;O:15:"SqlParser\Token":5:{s:5:"token";s:1:")";s:5:"value";s:1:")";s:4:"type";i:2;s:5:"flags";i:16;s:8:"position";i:22;}i:13;O:15:"SqlParser\Token":5:{s:5:"token";s:1:";";s:5:"value";s:1:";";s:4:"type";i:9;s:5:"flags";i:0;s:8:"position";i:23;}i:14;O:15:"SqlParser\Token":5:{s:5:"token";N;s:5:"value";N;s:4:"type";i:9;s:5:"flags";i:0;s:8:"position";N;}}s:5:"count";i:15;s:3:"idx";i:15;}s:9:"delimiter";s:1:";";s:12:"delimiterLen";i:1;s:6:"errors";a:0:{}}s:6:"parser";O:16:"SqlParser\Parser":5:{s:4:"list";r:8;s:6:"strict";b:0;s:6:"errors";a:0:{}s:10:"statements";a:2:{i:0;O:36:"SqlParser\Statements\SelectStatement":15:{s:4:"expr";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";N;s:6:"column";N;s:4:"expr";s:1:"1";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:4:"from";a:0:{}s:9:"partition";N;s:5:"where";N;s:5:"group";N;s:6:"having";N;s:5:"order";N;s:5:"limit";N;s:9:"procedure";N;s:4:"into";N;s:4:"join";N;s:5:"union";a:0:{}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:0:{}}s:5:"first";i:0;s:4:"last";i:4;}i:1;O:36:"SqlParser\Statements\SelectStatement":15:{s:4:"expr";a:1:{i:0;O:31:"SqlParser\Components\Expression":7:{s:8:"database";N;s:5:"table";N;s:6:"column";N;s:4:"expr";s:1:"2";s:5:"alias";N;s:8:"function";N;s:8:"subquery";N;}}s:4:"from";a:0:{}s:9:"partition";N;s:5:"where";N;s:5:"group";N;s:6:"having";N;s:5:"order";N;s:5:"limit";N;s:9:"procedure";N;s:4:"into";N;s:4:"join";N;s:5:"union";a:0:{}s:7:"options";O:33:"SqlParser\Components\OptionsArray":1:{s:7:"options";a:0:{}}s:5:"first";i:5;s:4:"last";i:12;}}s:8:"brackets";i:0;}s:6:"errors";a:2:{s:5:"lexer";a:0:{}s:6:"parser";a:0:{}}}