Support type names as KEY names

TODO:
- find a better way of checking for the key condition

Author: bgrgicak

tests/WP_SQLite_Translator_Tests.php

@@ -1252,6 +1252,51 @@ public function testColumnWithOnUpdate() {
 		$this->assertNull( $result[0]->updated_at );
 	}
 
+	public function testTimestampColumnNamedTimestamp() {
+		// CREATE TABLE with ON UPDATE
+		$this->assertQuery(
+			"CREATE TABLE `_tmp_table` (
+				`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+				`timestamp` datetime NOT NULL,
+				`numeric` int(11) NOT NULL,
+				PRIMARY KEY (`id`),
+				KEY timestamp (timestamp),
+				KEY numeric (numeric)
+			);"
+		);
+		$results = $this->assertQuery( 'DESCRIBE _tmp_table;' );
+		var_dump( $results );
+		$this->assertEquals(
+			array(
+				(object) array(
+					'Field'   => 'id',
+					'Type'    => 'bigint(20) unsigned',
+					'Null'    => 'NO',
+					'Key'     => 'PRI',
+					'Default' => '0',
+					'Extra'   => '',
+				),
+				(object) array(
+					'Field'   => 'timestamp',
+					'Type'    => 'datetime',
+					'Null'    => 'NO',
+					'Key'     => '',
+					'Default' => null,
+					'Extra'   => '',
+				),
+				(object) array(
+					'Field'   => 'numeric',
+					'Type'    => 'int(11)',
+					'Null'    => 'NO',
+					'Key'     => '',
+					'Default' => '0',
+					'Extra'   => '',
+				),
+			),
+			$results
+		);
+	}
+
 	public function testColumnWithOnUpdateAndNoIdField() {
 		// CREATE TABLE with ON UPDATE
 		$this->assertQuery(

wp-includes/sqlite/class-wp-sqlite-translator.php

@@ -1017,13 +1017,20 @@ private function parse_create_table() {
 			 * token is a data type.
 			 */
 			$second_token = $this->rewriter->peek_nth( 2 );
+			$current_token = $this->rewriter->peek();
 
 			if ( $second_token->matches(
 				WP_SQLite_Token::TYPE_KEYWORD,
 				WP_SQLite_Token::FLAG_KEYWORD_DATA_TYPE
+			) && !$current_token->matches(
+				WP_SQLite_Token::TYPE_KEYWORD,
+				WP_SQLite_Token::FLAG_KEYWORD_RESERVED,
+				array( 'KEY' )
 			) ) {
+				echo 'field';
 				$result->fields[] = $this->parse_mysql_create_table_field();
 			} else {
+				echo 'constraint';
 				$result->constraints[] = $this->parse_mysql_create_table_constraint();
 			}
 
@@ -1236,6 +1243,7 @@ private function parse_mysql_create_table_constraint() {
 		}
 
 		$result->value = $this->normalize_mysql_index_type( $constraint->value );
+		echo 'result value: ' . $result->value . "\n";
 		if ( $result->value ) {
 			$this->rewriter->skip(); // Constraint type.