Clean up and update inline docs

Author: bgrgicak

tests/WP_SQLite_Translator_Tests.php

@@ -1252,20 +1252,19 @@ public function testColumnWithOnUpdate() {
 		$this->assertNull( $result[0]->updated_at );
 	}
 
-	public function testTimestampColumnNamedTimestamp() {
+	public function testTypeKeywordsAsKeyNames() {
 		// CREATE TABLE with ON UPDATE
 		$this->assertQuery(
-			"CREATE TABLE `_tmp_table` (
+			'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 `timestamp` (`timestamp`),
 				KEY numeric (numeric)
-			);"
+			);'
 		);
 		$results = $this->assertQuery( 'DESCRIBE _tmp_table;' );
-		var_dump( $results );
 		$this->assertEquals(
 			array(
 				(object) array(

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

@@ -1010,27 +1010,21 @@ private function parse_create_table() {
 			 *     `my_field` varchar(255) NOT NULL DEFAULT 'foo'
 			 * Constraint definition, e.g.:
 			 *      PRIMARY KEY (`my_field`)
-			 *
-			 * Lexer does not seem to reliably understand whether the
-			 * first token is a field name or a reserved keyword, so
-			 * instead we'll check whether the second non-whitespace
-			 * token is a data type.
 			 */
-			$second_token = $this->rewriter->peek_nth( 2 );
 			$current_token = $this->rewriter->peek();
+			$second_token  = $this->rewriter->peek_nth( 2 );
 
-			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';
+			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,
+				)
+			) {
 				$result->fields[] = $this->parse_mysql_create_table_field();
 			} else {
-				echo 'constraint';
 				$result->constraints[] = $this->parse_mysql_create_table_constraint();
 			}