Merge branch 'zzycad-master'

Author: iamcal

src/SQLParser.php

@@ -108,7 +108,7 @@ private function _lex($sql){
 			#	<unsigned integer> [ <period> [ <unsigned integer> ] ]
 			#	<period> <unsigned integer>
 			#	<unsigned integer> ::= <digit>...
-			if (preg_match('!(\d+\.?\d*|\.\d+)!A', $sql, $m, 0, $pos)){
+			if (preg_match('![-+]?(\d+\.?\d*|\.\d+)!A', $sql, $m, 0, $pos)){
 				$source_map[] = array($pos, strlen($m[0]));
 				$pos += strlen($m[0]);
 				continue;
@@ -760,6 +760,11 @@ function parse_field($tokens){
 
 		# [UNIQUE [KEY] | [PRIMARY] KEY]
 		# [COMMENT 'string']
+		if (count($tokens) >= 1 && StrToUpper($tokens[0]) == 'COMMENT'){
+			$f['comment'] = $this->decode_value($tokens[1]);
+			array_shift($tokens);
+			array_shift($tokens);
+		}
 		# [COLUMN_FORMAT {FIXED|DYNAMIC|DEFAULT}]
 		# [STORAGE {DISK|MEMORY|DEFAULT}]
 		# [reference_definition]

tests/FieldTest.php

@@ -335,6 +335,19 @@ function testFieldOptions(){
 					'null' => true,
 				)
 			), $fields);
+
+			$fields = $this->get_fields("bar INT NOT NULL DEFAULT -1");
+			$this->assertEquals(array(
+				array(
+					'name' => "bar",
+					'type' => "INT",
+					'default' => '-1',
+					'null' => false,
+				)
+			), $fields);
+
+			$fields = $this->get_fields("ucount int NOT NULL comment 'user count'");
+			$this->assertEquals('user count', $fields[0]['comment']);
 		}
 
 		function testVirtualOptions(){