Fix values of "COLUMN_EXTRA" with "DEFAULT CURRENT TIMESTAMP"

Author: JanJakes

tests/WP_SQLite_Driver_Tests.php

@@ -3787,6 +3787,53 @@ public function testColumnDefaults(): void {
 		"
 		);
 
+		$result = $this->assertQuery( 'DESCRIBE t' );
+		$this->assertEquals(
+			array(
+				(object) array(
+					'Field'   => 'name',
+					'Type'    => 'varchar(255)',
+					'Null'    => 'YES',
+					'Key'     => '',
+					'Default' => 'CURRENT_TIMESTAMP',
+					'Extra'   => '',
+				),
+				(object) array(
+					'Field'   => 'type',
+					'Type'    => 'varchar(255)',
+					'Null'    => 'NO',
+					'Key'     => '',
+					'Default' => 'DEFAULT',
+					'Extra'   => '',
+				),
+				(object) array(
+					'Field'   => 'description',
+					'Type'    => 'varchar(250)',
+					'Null'    => 'NO',
+					'Key'     => '',
+					'Default' => '',
+					'Extra'   => '',
+				),
+				(object) array(
+					'Field'   => 'created_at',
+					'Type'    => 'timestamp',
+					'Null'    => 'YES',
+					'Key'     => '',
+					'Default' => 'CURRENT_TIMESTAMP',
+					'Extra'   => 'DEFAULT_GENERATED',
+				),
+				(object) array(
+					'Field'   => 'updated_at',
+					'Type'    => 'timestamp',
+					'Null'    => 'NO',
+					'Key'     => '',
+					'Default' => 'CURRENT_TIMESTAMP',
+					'Extra'   => 'DEFAULT_GENERATED on update CURRENT_TIMESTAMP',
+				),
+			),
+			$result
+		);
+
 		$result = $this->assertQuery( 'SHOW CREATE TABLE t' );
 		$this->assertEquals(
 			"CREATE TABLE `t` (\n"

wp-includes/sqlite-ast/class-wp-sqlite-information-schema-builder.php

@@ -1440,20 +1440,28 @@ private function get_column_extra( WP_Parser_Node $node ): string {
 			return 'auto_increment';
 		}
 
-		// Check whether DEFAULT value is an expression.
+		// AUTO_INCREMENT columns can't have a DEFAULT value.
+		foreach ( $attributes as $attr ) {
+			if ( $attr->has_child_token( WP_MySQL_Lexer::AUTO_INCREMENT_SYMBOL ) ) {
+				return 'auto_increment';
+			}
+		}
+
+		// Check whether DEFAULT value is generated.
 		foreach ( $attributes as $attr ) {
 			if (
 				$attr->has_child_token( WP_MySQL_Lexer::DEFAULT_SYMBOL )
-				&& $attr->has_child_node( 'exprWithParentheses' )
+				&& (
+					$attr->has_child_node( 'exprWithParentheses' )
+					|| $attr->has_child_token( WP_MySQL_Lexer::NOW_SYMBOL )
+				)
 			) {
 				$extras[] = 'DEFAULT_GENERATED';
 			}
 		}
 
+		// Check for ON UPDATE CURRENT_TIMESTAMP.
 		foreach ( $attributes as $attr ) {
-			if ( $attr->has_child_token( WP_MySQL_Lexer::AUTO_INCREMENT_SYMBOL ) ) {
-				return 'auto_increment';
-			}
 			if (
 				$attr->has_child_token( WP_MySQL_Lexer::ON_SYMBOL )
 				&& $attr->has_child_token( WP_MySQL_Lexer::UPDATE_SYMBOL )
@@ -1462,6 +1470,7 @@ private function get_column_extra( WP_Parser_Node $node ): string {
 			}
 		}
 
+		// Check for generated columns.
 		if ( $node->get_first_descendant_token( WP_MySQL_Lexer::VIRTUAL_SYMBOL ) ) {
 			$extras[] = 'VIRTUAL GENERATED';
 		} elseif ( $node->get_first_descendant_token( WP_MySQL_Lexer::STORED_SYMBOL ) ) {