fix comments with ,

EVODelavega · Nov 12, 2018 · 1a21f0e · 1a21f0e
1 parent 8110b3c
commit 1a21f0e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Model/Field.php b/src/Model/Field.php
@@ -211,7 +211,7 @@ public function parse($stmt)
             $this->type = $match[2];
             return $this;
         }
-        if (!preg_match('/^`([^`]+)`[\s]*([^\s]+(?!\()|[^)]+\))\s*([^,]*?)(DEFAULT\s+([^,]+)|AUTO_INCREMENT)?,?$/', $stmt, $match)) {
+        if (!preg_match('/^`([^`]+)`[\s]*([^\s]+(?!\()|[^)]+\))\s*([^,]*?)(DEFAULT\s+([^,]+)|AUTO_INCREMENT|COMMENT\s.+)?,?$/', $stmt, $match)) {
             throw new \RuntimeException(
                 sprintf(
                     'Unable to parse field-definition %s',

diff --git a/tests/_data/table.sql b/tests/_data/table.sql
@@ -1,9 +1,9 @@
 CREATE TABLE `foobar` (
-    `foobar_id` INT(11) unsigned NOT NULL AUTO_INCREMENT,
+    `foobar_id` INT(11) unsigned NOT NULL AUTO_INCREMENT COMMENT 'foobar, bar',
     `foo_name` VARCHAR(255) DEFAULT NULL,
     `bar_txt` text DEFAULT NULL,
     `sex` tinyint(1) NOT NULL DEFAULT 1,
-    `notes` mediumtext,
+    `notes` mediumtext COMMENT 'perfect col, with mediumtext',
     `created` datetime NOT NULL,
     PRIMARY KEY (`foobar_id`),
     KEY `name` (`foo_name`)