Merge pull request #27 from Automattic/temporary-table-support

Temporary table support

Author: JanJakes

.github/workflows/wp-tests-phpunit-run.js

@@ -47,9 +47,6 @@ const expectedErrors = [
 const expectedFailures = [
 	'Tests_Comment::test_wp_new_comment_respects_comment_field_lengths',
 	'Tests_Comment::test_wp_update_comment',
-	'Tests_DB_dbDelta::test_column_type_change_with_hyphens_in_name',
-	'Tests_DB_dbDelta::test_query_with_backticks_does_not_cause_a_query_to_alter_all_columns_and_indices_to_run_even_if_none_have_changed',
-	'Tests_DB_dbDelta::test_query_with_backticks_does_not_throw_an_undefined_index_warning',
 	'Tests_DB_dbDelta::test_spatial_indices',
 	'Tests_DB::test_charset_switched_to_utf8mb4',
 	'Tests_DB::test_close',

tests/WP_SQLite_Driver_Tests.php

@@ -3079,6 +3079,20 @@ public function testCreateTableIfNotExists(): void {
 		);
 	}
 
+	public function testCreateTemporaryTableIfNotExists(): void {
+		$this->assertQuery(
+			'CREATE TEMPORARY TABLE t (ID INTEGER, name TEXT)'
+		);
+		$this->assertQuery(
+			'CREATE TEMPORARY TABLE IF NOT EXISTS t (ID INTEGER, name TEXT)'
+		);
+
+		$this->expectExceptionMessage( 'table `t` already exists' );
+		$this->assertQuery(
+			'CREATE TEMPORARY TABLE t (ID INTEGER, name TEXT)'
+		);
+	}
+
 	public function testTranslatesComplexDelete() {
 		$this->sqlite->query(
 			"CREATE TABLE wptests_dummy (
@@ -3976,4 +3990,54 @@ public function getInformationSchemaIsReadonlyWithUseTestData(): array {
 			array( 'TRUNCATE tables' ),
 		);
 	}
+
+	public function testTemporaryTableHasPriorityOverStandardTable(): void {
+		// Create a standard and a temporary table with the same name.
+		$this->assertQuery( 'CREATE TABLE t (a INT, INDEX ia(a))' );
+		$this->assertQuery( 'CREATE TEMPORARY TABLE t (b INT, INDEX ib(b))' );
+
+		// SHOW CREATE TABLE will show the temporary table.
+		$result = $this->assertQuery( 'SHOW CREATE TABLE t' );
+		$this->assertEquals(
+			"CREATE TEMPORARY TABLE `t` (\n"
+				. "  `b` int DEFAULT NULL,\n"
+				. "  KEY `ib` (`b`)\n"
+				. ') ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
+			$result[0]->{'Create Table'}
+		);
+
+		// SHOW COLUMNS FROM will show the temporary table.
+		$result = $this->assertQuery( 'SHOW COLUMNS FROM t' );
+		$this->assertEquals( 'b', $result[0]->Field );
+
+		// DESCRIBE will show the temporary table.
+		$result = $this->assertQuery( 'DESCRIBE t' );
+		$this->assertEquals( 'b', $result[0]->Field );
+
+		// SHOW INDEXES FROM will show the temporary table.
+		$result = $this->assertQuery( 'SHOW INDEXES FROM t' );
+		$this->assertEquals( 'ib', $result[0]->Key_name );
+
+		// ALTER TABLE will use the temporary table.
+		$this->assertQuery( 'ALTER TABLE t ADD COLUMN c INT' );
+		$result = $this->assertQuery( 'SHOW COLUMNS FROM t' );
+		$this->assertEquals( 'b', $result[0]->Field );
+		$this->assertEquals( 'c', $result[1]->Field );
+
+		// The temporary table doesn't show up in information schema.
+		$result = $this->assertQuery( 'SELECT * FROM information_schema.columns WHERE table_name = "t"' );
+		$this->assertCount( 1, $result );
+		$this->assertEquals( 'a', $result[0]->COLUMN_NAME );
+
+		// First DROP TABLE removes the temporary table.
+		$this->assertQuery( 'DROP TABLE t' );
+		$result = $this->assertQuery( 'SHOW COLUMNS FROM t' );
+		$this->assertEquals( 'a', $result[0]->Field );
+
+		// Second DROP TABLE removes the standard table.
+		$this->expectException( WP_SQLite_Driver_Exception::class );
+		$this->expectExceptionMessage( "Table 'wp.t' doesn't exist" );
+		$this->assertQuery( 'DROP TABLE t' );
+		$result = $this->assertQuery( 'SHOW COLUMNS FROM t' );
+	}
 }

tests/WP_SQLite_Driver_Translation_Tests.php

@@ -401,23 +401,6 @@ public function testCreateTableWithPrimaryKeyAndAutoincrement(): void {
 		);
 	}
 
-	// @TODO: IF NOT EXISTS
-	/*public function testCreateTableWithIfNotExists(): void {
-		$this->assertQuery(
-			'CREATE TABLE IF NOT EXISTS "t" ( "id" INTEGER ) STRICT',
-			'CREATE TABLE IF NOT EXISTS t (id INT)'
-		);
-
-		$this->assertExecutedInformationSchemaQueries(
-			array(
-				'INSERT INTO _wp_sqlite_mysql_information_schema_tables (table_schema, table_name, table_type, engine, row_format, table_collation)'
-					. " VALUES ('wp', 't', 'BASE TABLE', 'InnoDB', 'Dynamic', 'utf8mb4_general_ci')",
-				'INSERT INTO _wp_sqlite_mysql_information_schema_columns (table_schema, table_name, column_name, ordinal_position, column_default, is_nullable, data_type, character_maximum_length, character_octet_length, numeric_precision, numeric_scale, datetime_precision, character_set_name, collation_name, column_type, column_key, extra, privileges, column_comment, generation_expression, srs_id)'
-					. " VALUES ('wp', 't', 'id', 1, null, 'YES', 'int', null, null, 10, 0, null, null, null, 'int', '', '', 'select,insert,update,references', '', '', null)",
-			)
-		);
-	}*/
-
 	public function testCreateTableWithInlineUniqueIndexes(): void {
 		$this->assertQuery(
 			array(
@@ -480,7 +463,8 @@ public function testCreateTableWithStandaloneUniqueIndexes(): void {
 		);
 	}
 
-	public function testCreateTableFromSelectQuery(): void {
+	// @TODO: Implement information schema support for CREATE TABLE ... AS SELECT.
+	/*public function testCreateTableFromSelectQuery(): void {
 		// CREATE TABLE AS SELECT ...
 		$this->assertQuery(
 			'CREATE TABLE `t1` AS SELECT * FROM `t2` STRICT',
@@ -493,22 +477,19 @@ public function testCreateTableFromSelectQuery(): void {
 			'CREATE TABLE `t1` AS SELECT * FROM `t2` STRICT',
 			'CREATE TABLE t1 SELECT * FROM t2'
 		);
-	}
+	}*/
 
 	public function testCreateTemporaryTable(): void {
 		$this->assertQuery(
 			'CREATE TEMPORARY TABLE `t` ( `id` INTEGER ) STRICT',
 			'CREATE TEMPORARY TABLE t (id INT)'
 		);
-
-		// With IF NOT EXISTS.
-		$this->assertQuery(
-			'CREATE TEMPORARY TABLE IF NOT EXISTS `t` ( `id` INTEGER ) STRICT',
-			'CREATE TEMPORARY TABLE IF NOT EXISTS t (id INT)'
-		);
 	}
 
 	public function testDropTemporaryTable(): void {
+		// Create a temporary table first so DROP doesn't fail.
+		$this->driver->query( 'CREATE TEMPORARY TABLE t (id INT)' );
+
 		$this->assertQuery(
 			'DROP TABLE `temp`.`t`',
 			'DROP TEMPORARY TABLE t'
@@ -1347,6 +1328,16 @@ private function assertQuery( $expected, string $query ): void {
 			$executed_queries = array_values( array_slice( $executed_queries, 1, -1, true ) );
 		}
 
+		// Remove temporary table existence checks.
+		$executed_queries = array_values(
+			array_filter(
+				$executed_queries,
+				function ( $query ) {
+					return "SELECT 1 FROM sqlite_temp_schema WHERE type = 'table' AND name = ?" !== $query;
+				}
+			)
+		);
+
 		// Remove "information_schema" queries.
 		$executed_queries = array_values(
 			array_filter(