Remove WP_SQLITE_AST_DRIVER feature flag and legacy driver references

The AST-based driver is now the only driver. Remove all conditional
logic that branched between the new and legacy driver:

- db.php: Always load the new driver.
- class-wp-sqlite-db.php: Remove WP_SQLite_Translator instanceof
  checks, simplify all methods to use WP_SQLite_Driver directly.
- install-functions.php: Always use WP_SQLite_Driver.
- admin-page.php: Remove "(AST)" suffix from admin bar.
- constants.php: Remove WP_SQLITE_AST_DRIVER env var handling.
- wp-setup.sh: Remove WP_SQLITE_AST_DRIVER env vars from Docker.
- wp-mysql-proxy.php: Remove WP_SQLITE_AST_DRIVER define.
- phpcs.xml.dist: Remove legacy translator exclusion.

Author: JanJakes

packages/mysql-proxy/bin/wp-mysql-proxy.php

@@ -6,8 +6,6 @@
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-define( 'WP_SQLITE_AST_DRIVER', true );
-
 // Process CLI arguments:
 $shortopts = 'h:d:p:l:';
 $longopts  = array( 'help', 'database:', 'port:', 'log-level:' );

packages/plugin-sqlite-database-integration/admin-page.php

@@ -155,8 +155,7 @@ function sqlite_plugin_adminbar_item( $admin_bar ) {
 	global $wpdb;
 
 	if ( defined( 'SQLITE_DB_DROPIN_VERSION' ) && defined( 'DB_ENGINE' ) && 'sqlite' === DB_ENGINE ) {
-		$suffix = defined( 'WP_SQLITE_AST_DRIVER' ) && WP_SQLITE_AST_DRIVER ? ' (AST)' : '';
-		$title  = '<span style="color:#46B450;">' . __( 'Database: SQLite', 'sqlite-database-integration' ) . $suffix . '</span>';
+		$title = '<span style="color:#46B450;">' . __( 'Database: SQLite', 'sqlite-database-integration' ) . '</span>';
 	} elseif ( stripos( $wpdb->db_server_info(), 'maria' ) !== false ) {
 		$title = '<span style="color:#DC3232;">' . __( 'Database: MariaDB', 'sqlite-database-integration' ) . '</span>';
 	} else {

packages/plugin-sqlite-database-integration/constants.php

@@ -51,8 +51,3 @@
 		define( 'FQDB', FQDBDIR . '.ht.sqlite' );
 	}
 }
-
-// Allow enabling the SQLite AST driver via environment variable.
-if ( ! defined( 'WP_SQLITE_AST_DRIVER' ) && isset( $_ENV['WP_SQLITE_AST_DRIVER'] ) && 'true' === $_ENV['WP_SQLITE_AST_DRIVER'] ) {
-	define( 'WP_SQLITE_AST_DRIVER', true );
-}

packages/plugin-sqlite-database-integration/wp-includes/sqlite/class-wp-sqlite-db.php

@@ -16,7 +16,7 @@ class WP_SQLite_DB extends wpdb {
 	/**
 	 * Database Handle
 	 *
-	 * @var WP_SQLite_Translator
+	 * @var WP_SQLite_Driver
 	 */
 	protected $dbh;
 
@@ -94,10 +94,6 @@ public function get_col_charset( $table, $column ) {
 	 * @param array $modes Optional. A list of SQL modes to set. Default empty array.
 	 */
 	public function set_sql_mode( $modes = array() ) {
-		if ( ! $this->dbh instanceof WP_SQLite_Driver ) {
-			return;
-		}
-
 		if ( empty( $modes ) ) {
 			$result = $this->dbh->query( 'SELECT @@SESSION.sql_mode' );
 			if ( ! isset( $result[0] ) ) {
@@ -189,12 +185,7 @@ public function _real_escape( $data ) {
 	 *                or real_escape next.
 	 */
 	public function esc_like( $text ) {
-		// The new driver adds "ESCAPE '\\'" to every LIKE expression by default.
-		// We only need to overload this function to a no-op for the old driver.
-		if ( $this->dbh instanceof WP_SQLite_Driver ) {
-			return parent::esc_like( $text );
-		}
-		return $text;
+		return parent::esc_like( $text );
 	}
 
 	/**
@@ -326,34 +317,28 @@ public function db_connect( $allow_bail = true ) {
 			}
 		}
 
-		if ( defined( 'WP_SQLITE_AST_DRIVER' ) && WP_SQLITE_AST_DRIVER ) {
-			if ( null === $this->dbname || '' === $this->dbname ) {
-				$this->bail(
-					'The database name was not set. The SQLite driver requires a database name to be set to emulate MySQL information schema tables.',
-					'db_connect_fail'
-				);
-				return false;
-			}
+		if ( null === $this->dbname || '' === $this->dbname ) {
+			$this->bail(
+				'The database name was not set. The SQLite driver requires a database name to be set to emulate MySQL information schema tables.',
+				'db_connect_fail'
+			);
+			return false;
+		}
 
-			$this->ensure_database_directory( FQDB );
-
-			try {
-				$connection      = new WP_SQLite_Connection(
-					array(
-						'pdo'          => $pdo,
-						'path'         => FQDB,
-						'journal_mode' => defined( 'SQLITE_JOURNAL_MODE' ) ? SQLITE_JOURNAL_MODE : null,
-					)
-				);
-				$this->dbh       = new WP_SQLite_Driver( $connection, $this->dbname );
-				$GLOBALS['@pdo'] = $this->dbh->get_connection()->get_pdo();
-			} catch ( Throwable $e ) {
-				$this->last_error = $this->format_error_message( $e );
-			}
-		} else {
-			$this->dbh        = new WP_SQLite_Translator( $pdo );
-			$this->last_error = $this->dbh->get_error_message();
-			$GLOBALS['@pdo']  = $this->dbh->get_pdo();
+		$this->ensure_database_directory( FQDB );
+
+		try {
+			$connection      = new WP_SQLite_Connection(
+				array(
+					'pdo'          => $pdo,
+					'path'         => FQDB,
+					'journal_mode' => defined( 'SQLITE_JOURNAL_MODE' ) ? SQLITE_JOURNAL_MODE : null,
+				)
+			);
+			$this->dbh       = new WP_SQLite_Driver( $connection, $this->dbname );
+			$GLOBALS['@pdo'] = $this->dbh->get_connection()->get_pdo();
+		} catch ( Throwable $e ) {
+			$this->last_error = $this->format_error_message( $e );
 		}
 		if ( $this->last_error ) {
 			return false;
@@ -467,11 +452,7 @@ public function query( $query ) {
 		if ( preg_match( '/^\s*(create|alter|truncate|drop)\s/i', $query ) ) {
 			$return_val = true;
 		} elseif ( preg_match( '/^\s*(insert|delete|update|replace)\s/i', $query ) ) {
-			if ( $this->dbh instanceof WP_SQLite_Driver ) {
-				$this->rows_affected = $this->dbh->get_last_return_value();
-			} else {
-				$this->rows_affected = $this->dbh->get_affected_rows();
-			}
+			$this->rows_affected = $this->dbh->get_last_return_value();
 
 			// Take note of the insert_id.
 			if ( preg_match( '/^\s*(insert|replace)\s/i', $query ) ) {
@@ -516,11 +497,7 @@ public function query( $query ) {
 			}
 
 			// Add SQLite query data.
-			if ( $this->dbh instanceof WP_SQLite_Driver ) {
-				$this->queries[ $i ]['sqlite_queries'] = $this->dbh->get_last_sqlite_queries();
-			} else {
-				$this->queries[ $i ]['sqlite_queries'] = $this->dbh->executed_sqlite_queries;
-			}
+			$this->queries[ $i ]['sqlite_queries'] = $this->dbh->get_last_sqlite_queries();
 		}
 		return $return_val;
 	}
@@ -545,10 +522,6 @@ private function _do_query( $query ) {
 			$this->last_error = $this->format_error_message( $e );
 		}
 
-		if ( $this->dbh instanceof WP_SQLite_Translator ) {
-			$this->last_error = $this->dbh->get_error_message();
-		}
-
 		++$this->num_queries;
 
 		if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES ) {
@@ -573,27 +546,23 @@ protected function load_col_info() {
 		if ( $this->col_info ) {
 			return;
 		}
-		if ( $this->dbh instanceof WP_SQLite_Driver ) {
-			$this->col_info = array();
-			foreach ( $this->dbh->get_last_column_meta() as $column ) {
-				$this->col_info[] = (object) array(
-					'name'       => $column['name'],
-					'orgname'    => $column['mysqli:orgname'],
-					'table'      => $column['table'],
-					'orgtable'   => $column['mysqli:orgtable'],
-					'def'        => '',    // Unused, always ''.
-					'db'         => $column['mysqli:db'],
-					'catalog'    => 'def', // Unused, always 'def'.
-					'max_length' => 0,     // As of PHP 8.1, this is always 0.
-					'length'     => $column['len'],
-					'charsetnr'  => $column['mysqli:charsetnr'],
-					'flags'      => $column['mysqli:flags'],
-					'type'       => $column['mysqli:type'],
-					'decimals'   => $column['precision'],
-				);
-			}
-		} else {
-			$this->col_info = $this->dbh->get_columns();
+		$this->col_info = array();
+		foreach ( $this->dbh->get_last_column_meta() as $column ) {
+			$this->col_info[] = (object) array(
+				'name'       => $column['name'],
+				'orgname'    => $column['mysqli:orgname'],
+				'table'      => $column['table'],
+				'orgtable'   => $column['mysqli:orgtable'],
+				'def'        => '',    // Unused, always ''.
+				'db'         => $column['mysqli:db'],
+				'catalog'    => 'def', // Unused, always 'def'.
+				'max_length' => 0,     // As of PHP 8.1, this is always 0.
+				'length'     => $column['len'],
+				'charsetnr'  => $column['mysqli:charsetnr'],
+				'flags'      => $column['mysqli:flags'],
+				'type'       => $column['mysqli:type'],
+				'decimals'   => $column['precision'],
+			);
 		}
 	}
 

packages/plugin-sqlite-database-integration/wp-includes/sqlite/db.php

@@ -47,16 +47,7 @@
 	);
 }
 
-if ( defined( 'WP_SQLITE_AST_DRIVER' ) && WP_SQLITE_AST_DRIVER ) {
-	require_once __DIR__ . '/../database/load.php';
-} else {
-	require_once __DIR__ . '/php-polyfills.php';
-	require_once __DIR__ . '/class-wp-sqlite-lexer.php';
-	require_once __DIR__ . '/class-wp-sqlite-query-rewriter.php';
-	require_once __DIR__ . '/class-wp-sqlite-translator.php';
-	require_once __DIR__ . '/class-wp-sqlite-token.php';
-	require_once __DIR__ . '/class-wp-sqlite-pdo-user-defined-functions.php';
-}
+require_once __DIR__ . '/../database/load.php';
 require_once __DIR__ . '/class-wp-sqlite-db.php';
 require_once __DIR__ . '/install-functions.php';
 

packages/plugin-sqlite-database-integration/wp-includes/sqlite/install-functions.php

@@ -34,14 +34,10 @@ function sqlite_make_db_sqlite() {
 		wp_die( $message, 'Database Error!' );
 	}
 
-	if ( defined( 'WP_SQLITE_AST_DRIVER' ) && WP_SQLITE_AST_DRIVER ) {
-		$translator = new WP_SQLite_Driver(
-			new WP_SQLite_Connection( array( 'pdo' => $pdo ) ),
-			$wpdb->dbname
-		);
-	} else {
-		$translator = new WP_SQLite_Translator( $pdo );
-	}
+	$translator = new WP_SQLite_Driver(
+		new WP_SQLite_Connection( array( 'pdo' => $pdo ) ),
+		$wpdb->dbname
+	);
 	$query = null;
 
 	try {

phpcs.xml.dist

@@ -62,7 +62,6 @@
 	-->
 
 	<rule ref="WordPress.DB.RestrictedClasses.mysql__PDO">
-		<exclude-pattern>/packages/plugin-sqlite-database-integration/wp-includes/sqlite/class-wp-sqlite-translator.php</exclude-pattern>
 		<exclude-pattern>/packages/mysql-on-sqlite/src/sqlite/*\.php</exclude-pattern>
 		<exclude-pattern>/tests/*</exclude-pattern>
 	</rule>

wp-setup.sh

@@ -31,26 +31,20 @@ echo "Adding 'docker-compose.override.yml' to the WordPress repository..."
 cat << EOF > "$WP_DIR/docker-compose.override.yml"
 services:
   wordpress-develop:
-    environment:
-      WP_SQLITE_AST_DRIVER: true
     volumes:
       - ../packages/plugin-sqlite-database-integration:/var/www/src/wp-content/plugins/sqlite-database-integration
       - ../packages/mysql-on-sqlite/src:/var/www/src/wp-content/plugins/sqlite-database-integration/wp-includes/database
 
   php:
     # PHP temporarily pinned to 8.3.10, see: https://github.com/WordPress/wordpress-develop/pull/9602
     image: wordpressdevelop/php@sha256:c0ba85936a9d1ac2c98bf3da2d62ceb0e5787a6b11e383630df0c5a5bf2534b5
-    environment:
-      WP_SQLITE_AST_DRIVER: true
     volumes:
       - ../packages/plugin-sqlite-database-integration:/var/www/src/wp-content/plugins/sqlite-database-integration
       - ../packages/mysql-on-sqlite/src:/var/www/src/wp-content/plugins/sqlite-database-integration/wp-includes/database
 
   cli:
     # PHP temporarily pinned to 8.3.10, see: https://github.com/WordPress/wordpress-develop/pull/9602
     image: wordpressdevelop/cli@sha256:85ad7d7a9c3bd9a8775fc83aea7f7dfc0aad25b2bc4f7d740696b28cd2a0ef89
-    environment:
-      WP_SQLITE_AST_DRIVER: true
     volumes:
       - ../packages/plugin-sqlite-database-integration:/var/www/src/wp-content/plugins/sqlite-database-integration
       - ../packages/mysql-on-sqlite/src:/var/www/src/wp-content/plugins/sqlite-database-integration/wp-includes/database