actually include constraint information in the index (duh).

added tests for constraints

Author: iamcal

src/SQLParser.php

@@ -337,7 +337,7 @@ function parse_field_or_key(&$tokens, &$fields, &$indexes){
 				array_shift($tokens);
 			}else{
 				array_shift($tokens);
-				$constraint = array_shift($tokens);
+				$constraint = $this->decode_identifier(array_shift($tokens));
 			}
 		}
 
@@ -364,6 +364,11 @@ function parse_field_or_key(&$tokens, &$fields, &$indexes){
 					'type' => 'INDEX',
 				);
 
+				if ($has_constraint){
+					$index['constraint'] = true;
+					if (!is_null($constraint)) $index['constraint_name'] = $constraint;
+				}
+
 				if ($tokens[0] == 'UNIQUE'	) $index['type'] = 'UNIQUE';
 				if ($tokens[0] == 'UNIQUE INDEX') $index['type'] = 'UNIQUE';
 				if ($tokens[0] == 'UNIQUE KEY'	) $index['type'] = 'UNIQUE';
@@ -394,6 +399,11 @@ function parse_field_or_key(&$tokens, &$fields, &$indexes){
 					'type'	=> 'PRIMARY',
 				);
 
+				if ($has_constraint){
+					$index['constraint'] = true;
+					if (!is_null($constraint)) $index['constraint_name'] = $constraint;
+				}
+
 				array_shift($tokens);
 
 				$this->parse_index_mode($tokens, $index);
@@ -442,10 +452,20 @@ function parse_field_or_key(&$tokens, &$fields, &$indexes){
 				return;
 
 
-			# older stuff
+			# unsupported
+
+			case 'FOREIGN KEY':
+
+				# TODO
+				$fields[] = array(
+					'_'		=> 'FOREIGN KEY',
+					'tokens'	=> $tokens,
+				);
+				return;
 
 			case 'CHECK':
 
+				# TODO
 				$fields[] = array(
 					'_'		=> 'CHECK',
 					'tokens'	=> $tokens,

tests/IndexTest.php

@@ -53,7 +53,17 @@ function testIndexTypes(){
 
 		function testConstraints(){
 
-			# TODO
+			$tbl = $this->get_first_table("CREATE TABLE foo (bar INT, CONSTRAINT UNIQUE INDEX(bar))");
+			$this->assertEquals($tbl['indexes'][0]['constraint'], true);
+			$this->assertEquals(array_key_exists('constraint_name', $tbl['indexes'][0]), false);
+
+			$tbl = $this->get_first_table("CREATE TABLE foo (bar INT, CONSTRAINT `qux` UNIQUE INDEX(bar))");
+			$this->assertEquals($tbl['indexes'][0]['constraint'], true);
+			$this->assertEquals($tbl['indexes'][0]['constraint_name'], 'qux');
+
+			$tbl = $this->get_first_table("CREATE TABLE foo (bar INT, CONSTRAINT `qux` PRIMARY KEY(bar))");
+			$this->assertEquals($tbl['indexes'][0]['constraint'], true);
+			$this->assertEquals($tbl['indexes'][0]['constraint_name'], 'qux');
 		}
 
 		function testIndexNames(){