Fixed parsing of table with DEFAULT and COMMENT.

Fixes #39 Signed-off-by: Michal Čihař <michal@cihar.com>
phpmyadmin · Mar 2, 2016 · ad0e75f · ad0e75f
1 parent 415d44d
commit ad0e75f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/Components/Expression.php b/src/Components/Expression.php
@@ -254,6 +254,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                         continue;
                     }
                     $isExpr = true;
+                } elseif ($brackets === 0 && count($ret->expr) > 0) {
+                    /* End of expression */
+                    break;
                 }
             }
 

diff --git a/tests/Builder/CreateStatementTest.php b/tests/Builder/CreateStatementTest.php
@@ -42,6 +42,25 @@ public function testBuilderDatabase()
         );
     }
 
+    public function testBuilderDefaultComment()
+    {
+        $parser = new Parser(
+            "CREATE TABLE `wp_audio` (" .
+            " `somedata` int(11) DEFAULT NULL COMMENT 'ma data', " .
+            " `someinfo` int(11) DEFAULT NULL COMMENT 'ma info' ".
+            " )"
+        );
+        $stmt = $parser->statements[0];
+
+        $this->assertEquals(
+            "CREATE TABLE `wp_audio` (\n" .
+            "  `somedata` int(11) DEFAULT NULL COMMENT 'ma data',\n" .
+            "  `someinfo` int(11) DEFAULT NULL COMMENT 'ma info'\n".
+            ") ",
+            $stmt->build()
+        );
+    }
+
     public function testBuilderTable()
     {
         $stmt = new CreateStatement();