fixed index mode parser to not overflow for btree mode as last token of index.

added support for index comments (mysql 5.7)
added tests for all idnex options

Author: iamcal

src/SQLParser.php

@@ -798,8 +798,8 @@ function _extract_tokens($sql, &$source_map){
 
 	function parse_index_mode(&$tokens, &$index){
 		if (count($tokens) >= 1){
-			if ($tokens[0] == 'USING BTREE'){ $index['mode'] = 'BTREE'; array_shift($tokens); }
-			if ($tokens[0] == 'USING HASH' ){ $index['mode'] = 'HASH'; array_shift($tokens); }
+			if ($tokens[0] == 'USING BTREE'){ $index['mode'] = 'BTREE'; array_shift($tokens); return; }
+			if ($tokens[0] == 'USING HASH' ){ $index['mode'] = 'HASH'; array_shift($tokens); return; }
 		}
 	}
 
@@ -853,6 +853,7 @@ function parse_index_options(&$tokens, &$index){
 		#    KEY_BLOCK_SIZE [=] value
 		#  | index_type
 		#  | WITH PARSER parser_name
+		#  | COMMENT 'string'
 
 		if (count($tokens) >= 1){
 			if ($tokens[0] == 'KEY_BLOCK_SIZE'){
@@ -872,6 +873,14 @@ function parse_index_options(&$tokens, &$index){
 				array_shift($tokens);
 			}
 		}
+
+		if (count($tokens) >= 1){
+			if ($tokens[0] == 'COMMENT'){
+				$index['comment'] = $this->decode_value($tokens[1]);
+				array_shift($tokens);
+				array_shift($tokens);
+			}
+		}
 	}
 
 

tests/IndexTest.php

@@ -134,7 +134,27 @@ function testIndexCols(){
 
 		function testIndexOptions(){
 
-			# TODO
+			# key block size
+			$tbl = $this->get_first_table("CREATE TABLE foo (bar INT, baz INT, PRIMARY KEY (bar) KEY_BLOCK_SIZE 4)");
+			$this->assertEquals($tbl['indexes'][0]['key_block_size'], "4");
+
+			$tbl = $this->get_first_table("CREATE TABLE foo (bar INT, baz INT, PRIMARY KEY (bar) KEY_BLOCK_SIZE=4)");
+			$this->assertEquals($tbl['indexes'][0]['key_block_size'], "4");
+
+			# key mode
+			$tbl = $this->get_first_table("CREATE TABLE foo (bar INT, baz INT, PRIMARY KEY (bar) USING BTREE)");
+			$this->assertEquals($tbl['indexes'][0]['mode'], "BTREE");
+
+			$tbl = $this->get_first_table("CREATE TABLE foo (bar INT, baz INT, PRIMARY KEY (bar) USING HASH)");
+			$this->assertEquals($tbl['indexes'][0]['mode'], "HASH");
+
+			# parser
+			$tbl = $this->get_first_table("CREATE TABLE foo (bar INT, baz INT, PRIMARY KEY (bar) WITH PARSER foo)");
+			$this->assertEquals($tbl['indexes'][0]['parser'], "foo");
+
+			# comment
+			$tbl = $this->get_first_table("CREATE TABLE foo (bar INT, baz INT, PRIMARY KEY (bar) COMMENT \"hello world\")");
+			$this->assertEquals($tbl['indexes'][0]['comment'], "hello world");
 		}
 
 		function get_first_table($str){