#26 Correct result set columns from SHOW COLUMNS FROM table.

Author: OllieJones

tests/WP_SQLite_Query_Tests.php

@@ -64,7 +64,7 @@ public function setUp(): void {
 				$err->errorInfo; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 			$err_code = $err_data[1];
 			$translator->rollback();
-			$message  = sprintf(
+			$message = sprintf(
 				'Error occurred while creating tables or indexes...<br />Query was: %s<br />',
 				var_export( $query, true )
 			);
@@ -112,37 +112,24 @@ public function setUp(): void {
 		}
 	}
 
-	private function assertQuery( $sql ) {
-		$retval = $this->engine->query( $sql );
-		$this->assertEquals(
-			'',
-			$this->engine->get_error_message()
-		);
-		$this->assertNotFalse(
-			$retval
-		);
-
-		return $retval;
-	}
-
-	public function testGreatestLeast () {
+	public function testGreatestLeast() {
 		$q = <<<'QUERY'
 SELECT GREATEST('a', 'b') letter;
 QUERY;
 
 		$result = $this->assertQuery( $q );
 		$actual = $this->engine->get_query_results();
-		$this->assertEquals(1, count( $actual ));
-		$this->assertEquals('b', $actual[0]->letter);
+		$this->assertEquals( 1, count( $actual ) );
+		$this->assertEquals( 'b', $actual[0]->letter );
 
 		$q = <<<'QUERY'
 SELECT LEAST('a', 'b') letter;
 QUERY;
 
 		$result = $this->assertQuery( $q );
 		$actual = $this->engine->get_query_results();
-		$this->assertEquals(1, count( $actual ));
-		$this->assertEquals('a', $actual[0]->letter);
+		$this->assertEquals( 1, count( $actual ) );
+		$this->assertEquals( 'a', $actual[0]->letter );
 
 		$q = <<<'QUERY'
 SELECT GREATEST(2, 1.5) num;
@@ -224,8 +211,6 @@ public function testLikeEscapingParenAfterLike() {
 		$this->assertEquals( 'visible_meta_key_40', $last );
 	}
 
-	// https://github.com/WordPress/sqlite-database-integration/issues/19
-
 	public function testLikeEscapingWithConcatFunction() {
 		$q = <<<'QUERY'
 SELECT DISTINCT meta_key FROM wp_postmeta WHERE meta_key NOT BETWEEN '_' AND '_z' AND meta_key NOT LIKE CONCAT('\_', '%') ORDER BY meta_key LIMIT 30
@@ -239,6 +224,8 @@ public function testLikeEscapingWithConcatFunction() {
 		$this->assertEquals( 'visible_meta_key_30', $last );
 	}
 
+	// https://github.com/WordPress/sqlite-database-integration/issues/19
+
 	public function testHavingWithoutGroupBy() {
 
 		$q = <<<'QUERY'
@@ -370,6 +357,7 @@ public function testExpiredTransients() {
 			self::assertLessThan( time(), $row->option_timeout );
 		}
 	}
+
 	public function testDeleteExpiredNonSiteTransients() {
 
 		$now = time();
@@ -425,7 +413,7 @@ public function testDeleteExpiredNonSiteTransients() {
 		$count_unexpired = 0;
 		foreach ( $actual as $row ) {
 			if ( str_starts_with( $row->option_name, '_transient' ) ) {
-				$count_unexpired++;
+				$count_unexpired ++;
 				$this->assertGreaterThan( $now, $row->option_timeout );
 			}
 		}
@@ -491,7 +479,7 @@ public function testRecoverSerialized() {
 		$this->assertEquals( $obj, $unserialized );
 
 		$obj ['two'] ++;
-		$obj ['pi']          *= 2;
+		$obj ['pi']           *= 2;
 		$option_value         = serialize( $obj );
 		$option_value_escaped = $this->engine->get_pdo()->quote( $option_value );
 		/* Note well: this is heredoc not nowdoc */
@@ -514,7 +502,36 @@ public function testRecoverSerialized() {
 		$this->assertEquals( $option_value, $retrieved_string );
 		$unserialized = unserialize( $retrieved_string );
 		$this->assertEquals( $obj, $unserialized );
+	}
+
+	public function testShowColumns() {
+
+		$query = 'SHOW COLUMNS FROM wp_posts';
+		$this->assertQuery( $query );
+
+		$actual = $this->engine->get_query_results();
+		foreach ( $actual as $row ) {
+			$this->assertIsObject( $row );
+			$this->assertTrue( property_exists( $row, 'Field' ) );
+			$this->assertTrue( property_exists( $row, 'Type' ) );
+			$this->assertTrue( property_exists( $row, 'Null' ) );
+			$this->assertTrue( ( 'NO' === $row->Null ) || ( 'YES' === $row->Null ) );
+			$this->assertTrue( property_exists( $row, 'Key' ) );
+			$this->assertTrue( property_exists( $row, 'Default' ) );
+		}
+	}
+
+	private function assertQuery( $sql ) {
+		$retval = $this->engine->query( $sql );
+		$this->assertEquals(
+			'',
+			$this->engine->get_error_message()
+		);
+		$this->assertNotFalse(
+			$retval
+		);
 
+		return $retval;
 	}
 
 }

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

@@ -2937,9 +2937,35 @@ private function execute_show() {
 				$stmt       = $this->execute_sqlite_query(
 					"PRAGMA table_info(\"$table_name\");"
 				);
-				$this->set_results_from_fetched_data(
-					$stmt->fetchAll( $this->pdo_fetch_mode )
+				/* @todo we may need to add the Extra column if anybdy needs it. 'auto_increment' is the value */
+				$name_map = array(
+					'name'       => 'Field',
+					'type'       => 'Type',
+					'dflt_value' => 'Default',
+					'cid'        => null,
+					'notnull'    => null,
+					'pk'         => null,
 				);
+				$columns  = $stmt->fetchAll( $this->pdo_fetch_mode );
+				$columns  = array_map( function ( $row ) use ( $name_map ) {
+					$new       = array();
+					$is_object = is_object( $row );
+					$row       = $is_object ? (array) $row : $row;
+					foreach ( $row as $k => $v ) {
+						$k = array_key_exists( $k, $name_map ) ? $name_map [ $k ] : $k;
+						if ( $k ) {
+							$new[ $k ] = $v;
+						}
+					}
+					if ( array_key_exists( 'notnull', $row ) ) {
+						$new['Null'] = ( '1' === $row ['notnull'] ) ? 'NO' : 'YES';
+					}
+					if ( array_key_exists( 'pk', $row ) ) {
+						$new['Key'] = ( '1' === $row ['pk'] ) ? 'PRI' : '';
+					}
+					return $is_object ? (object) $new : $new;
+				}, $columns );
+				$this->set_results_from_fetched_data( $columns );
 				return;
 
 			case 'INDEX FROM':