tests for BIT, CHAR/VARCHAR/etc fields

better field test helper
implemented binary flag parser
added binary support for CHAR/VARCHAR (new in MySQL 5.7)
decode charset and collation entities

Author: iamcal

src/SQLParser.php

@@ -628,17 +628,19 @@ function parse_field($tokens){
 				$this->parse_field_length($tokens, $f);
 				break;
 
-			# CHAR[(length)] [CHARACTER SET charset_name] [COLLATE collation_name]
+			# CHAR[(length)] [BINARY] [CHARACTER SET charset_name] [COLLATE collation_name]
 			case 'CHAR':
 
+				$this->parse_field_binary($tokens, $f);
 				$this->parse_field_length($tokens, $f);
 				$this->parse_field_charset($tokens, $f);
 				$this->parse_field_collate($tokens, $f);
 				break;
 
-			# VARCHAR(length) [CHARACTER SET charset_name] [COLLATE collation_name]
+			# VARCHAR(length) [BINARY] [CHARACTER SET charset_name] [COLLATE collation_name]
 			case 'VARCHAR':
 
+				$this->parse_field_binary($tokens, $f);
 				$this->parse_field_length($tokens, $f);
 				$this->parse_field_charset($tokens, $f);
 				$this->parse_field_collate($tokens, $f);
@@ -653,7 +655,7 @@ function parse_field($tokens){
 			case 'MEDIUMTEXT':
 			case 'LONGTEXT':
 
-				# binary
+				$this->parse_field_binary($tokens, $f);
 				$this->parse_field_charset($tokens, $f);
 				$this->parse_field_collate($tokens, $f);
 				break;
@@ -992,6 +994,15 @@ function parse_field_length_decimals(&$tokens, &$f){
 		}
 	}
 
+	function parse_field_binary(&$tokens, &$f){
+		if (count($tokens) >= 1){
+			if (StrToUpper($tokens[0]) == 'BINARY'){
+				$f['binary'] = true;
+				array_shift($tokens);
+			}
+		}
+	}
+
 	function parse_field_unsigned(&$tokens, &$f){
 		if (count($tokens) >= 1){
 			if (StrToUpper($tokens[0]) == 'UNSIGNED'){
@@ -1013,7 +1024,7 @@ function parse_field_zerofill(&$tokens, &$f){
 	function parse_field_charset(&$tokens, &$f){
 		if (count($tokens) >= 1){
 			if (StrToUpper($tokens[0]) == 'CHARACTER SET'){
-				$f['character_set'] = $tokens[1];
+				$f['character_set'] = $this->decode_identifier($tokens[1]);
 				array_shift($tokens);
 				array_shift($tokens);
 			}
@@ -1023,7 +1034,7 @@ function parse_field_charset(&$tokens, &$f){
 	function parse_field_collate(&$tokens, &$f){
 		if (count($tokens) >= 1){
 			if (StrToUpper($tokens[0]) == 'COLLATE'){
-				$f['collation'] = $tokens[1];
+				$f['collation'] = $this->decode_identifier($tokens[1]);
 				array_shift($tokens);
 				array_shift($tokens);
 			}

tests/FieldTest.php

@@ -187,6 +187,23 @@ function testTimes(){
 		function testBits(){
 
 			# BIT[(length)]
+
+			$tbl = $this->get_first_table("CREATE TABLE foo (bar bit)");
+			$this->assertEquals($tbl['fields'], [
+				[
+					'name' => "bar",
+					'type' => "BIT",
+				]
+			]);
+
+			$tbl = $this->get_first_table("CREATE TABLE foo (bar BIT (999))");
+			$this->assertEquals($tbl['fields'], [
+				[
+					'name' => "bar",
+					'type' => "BIT",
+					'length' => 999,
+				]
+			]);
 		}
 
 		function testChars(){
@@ -195,6 +212,63 @@ function testChars(){
 			# VARCHAR(length) [BINARY] [CHARACTER SET charset_name] [COLLATE collation_name]
 			# BINARY[(length)]
 			# VARBINARY(length)
+
+			$fields = $this->get_fields("bar CHAR BINARY CHARACTER SET `utf19`");
+			$this->assertEquals([
+				[
+					'name' => "bar",
+					'type' => "CHAR",
+					'binary' => true,
+					'character_set' => "utf19",
+
+				]
+			], $fields);
+
+			$fields = $this->get_fields("bar CHAR(15) CHARACTER SET `utf19` COLLATE `utf19_awesome`");
+			$this->assertEquals([
+				[
+					'name' => "bar",
+					'type' => "CHAR",
+					'length' => 15,
+					'character_set' => "utf19",
+					'collation' => "utf19_awesome",
+				]
+			], $fields);
+
+			$fields = $this->get_fields("bar VARCHAR(255)`");
+			$this->assertEquals([
+				[
+					'name' => "bar",
+					'type' => "VARCHAR",
+					'length' => 255,
+				]
+			], $fields);
+
+			$fields = $this->get_fields("bar BINARY");
+			$this->assertEquals([
+				[
+					'name' => "bar",
+					'type' => "BINARY",
+				]
+			], $fields);
+
+			$fields = $this->get_fields("bar BINARY(66)");
+			$this->assertEquals([
+				[
+					'name' => "bar",
+					'type' => "BINARY",
+					'length' => 66,
+				]
+			], $fields);
+
+			$fields = $this->get_fields("bar VARBINARY(1024)");
+			$this->assertEquals([
+				[
+					'name' => "bar",
+					'type' => "VARBINARY",
+					'length' => 1024,
+				]
+			], $fields);
 		}
 
 		function testTexts(){
@@ -251,6 +325,13 @@ function testVirtualOptions(){
 		}
 
 
+		function get_fields($indexes){
+
+			$sql = "CREATE TABLE foo ($indexes)";
+			$tbl = $this->get_first_table($sql);
+			return $tbl['fields'];
+		}
+
 		function get_first_table($str){
 			$obj = new iamcal\SQLParser();
 			$obj->parse($str);