support for multiple index options, with tests

Author: iamcal

src/SQLParser.php

@@ -849,37 +849,43 @@ function parse_index_columns(&$tokens, &$index){
 	}
 
 	function parse_index_options(&$tokens, &$index){
+
 		# index_option:
 		#    KEY_BLOCK_SIZE [=] value
 		#  | index_type
 		#  | WITH PARSER parser_name
 		#  | COMMENT 'string'
 
-		if (count($tokens) >= 1){
+		while (count($tokens) >= 1){
+
 			if ($tokens[0] == 'KEY_BLOCK_SIZE'){
 				array_shift($tokens);
 				if ($tokens[0] == '=') array_shift($tokens);
 				$index['key_block_size'] = $tokens[0];
 				array_shift($tokens);
+				continue;
 			}
-		}
-
-		$this->parse_index_mode($tokens, $index);
 
-		if (count($tokens) >= 1){
 			if ($tokens[0] == 'WITH PARSER'){
 				$index['parser'] = $tokens[1];
 				array_shift($tokens);
 				array_shift($tokens);
+				continue;
 			}
-		}
 
-		if (count($tokens) >= 1){
 			if ($tokens[0] == 'COMMENT'){
 				$index['comment'] = $this->decode_value($tokens[1]);
 				array_shift($tokens);
 				array_shift($tokens);
+				continue;
 			}
+
+			if (!isset($index['mode'])){
+				$this->parse_index_mode($tokens, $index);
+				if (isset($index['mode'])) continue;
+			}
+
+			break;
 		}
 	}
 

tests/IndexTest.php

@@ -155,6 +155,13 @@ function testIndexOptions(){
 			# 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");
+
+			# everything
+			$tbl = $this->get_first_table("CREATE TABLE foo (bar INT, baz INT, PRIMARY KEY (bar) COMMENT \"hello world\" USING HASH KEY_BLOCK_SIZE=4 WITH PARSER foo)");
+			$this->assertEquals($tbl['indexes'][0]['comment'], "hello world");
+			$this->assertEquals($tbl['indexes'][0]['mode'], "HASH");
+			$this->assertEquals($tbl['indexes'][0]['key_block_size'], "4");
+			$this->assertEquals($tbl['indexes'][0]['parser'], "foo");
 		}
 
 		function get_first_table($str){