Remove legacy SQLite driver

.github/workflows/phpunit-tests-run.yml

@@ -12,19 +12,13 @@ on:
         description: 'The version of PHP to use, in the format of X.Y'
         required: true
         type: 'string'
-      phpunit-config:
-        description: 'The PHPUnit configuration file to use'
-        required: false
-        type: 'string'
-        default: 'phpunit.xml.dist'
       sqlite:
         description: 'SQLite version to install (e.g., 3.24.0). Leave empty for latest version.'
         required: false
         type: 'string'
         default: 'latest'
 env:
   LOCAL_PHP: ${{ inputs.php }}-fpm
-  PHPUNIT_CONFIG: ${{ inputs.phpunit-config }}
 
 jobs:
   phpunit-tests:
@@ -88,6 +82,3 @@ jobs:
       - name: Run PHPUnit tests
         run: php ./vendor/bin/phpunit -c ./phpunit.xml.dist
         working-directory: packages/mysql-on-sqlite
-
-      - name: Run PHPUnit tests for the legacy driver
-        run: php ./vendor/bin/phpunit -c ./phpunit.xml.dist

.github/workflows/phpunit-tests.yml

@@ -43,4 +43,3 @@ jobs:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}
       sqlite: ${{ matrix.sqlite || 'latest' }}
-      phpunit-config: ${{ 'phpunit.xml.dist' }}

AGENTS.md

@@ -28,15 +28,6 @@ The codebase is pure PHP with zero dependencies. It supports PHP 7.2 through 8.5
 MySQL syntax from version 5.7 onward, and requires SQLite 3.37.0 or newer
 (with legacy mode down to 3.27.0).
 
-### New and old driver
-At the moment, the project includes two MySQL-on-SQLite driver implementations:
-1. A new, AST-based MySQL-on-SQLite driver (`class-wp-pdo-mysql-on-sqlite.php`).
-2. A legacy, token-based MySQL-to-SQLite translator (`class-wp-sqlite-translator.php`).
-
-This state is temporary. The new driver will fully replace the legacy one. New features
-must always be implemented in the new driver. The legacy driver can receive small fixes.
-The new driver is under a `WP_SQLITE_AST_DRIVER` feature flag, but it is widely used.
-
 ## Commands
 The codebase is written in PHP and Composer is used to manage the project.
 The following commands are useful for development and testing:
@@ -54,10 +45,7 @@ composer run test                       # Run unit tests
 composer run test tests/SomeTest.php    # Run specific unit test file
 composer run test -- --filter testName  # Run specific unit test class/method
 
-# SQLite Database Integration plugin tests
-composer run test                       # Run unit tests
-composer run test tests/SomeTest.php    # Run specific unit test file
-composer run test -- --filter testName  # Run specific unit test class/method
+# SQLite Database Integration plugin E2E tests
 composer run test-e2e                   # Run E2E tests (Playwright via WP env)
 
 # WordPress tests

README.md

@@ -43,10 +43,7 @@ composer run test                       # Run unit tests
 composer run test tests/SomeTest.php    # Run specific unit test file
 composer run test -- --filter testName  # Run specific unit test class/method
 
-# SQLite Database Integration plugin tests
-composer run test                       # Run unit tests
-composer run test tests/SomeTest.php    # Run specific unit test file
-composer run test -- --filter testName  # Run specific unit test class/method
+# SQLite Database Integration plugin E2E tests
 composer run test-e2e                   # Run E2E tests (Playwright via WP env)
 
 # WordPress tests

composer.json

@@ -18,9 +18,7 @@
 		"squizlabs/php_codesniffer": "^3.7",
 		"wp-coding-standards/wpcs": "^3.1",
 		"phpcompatibility/phpcompatibility-wp": "*",
-		"php-parallel-lint/php-parallel-lint": "^1.3",
-		"yoast/phpunit-polyfills": "2.0.0",
-		"phpunit/phpunit": "8.5.52"
+		"php-parallel-lint/php-parallel-lint": "^1.3"
 	},
 	"config": {
 		"allow-plugins": {
@@ -42,9 +40,6 @@
 		"prepare-release": [
 			"./bin/prepare-release.sh"
 		],
-		"test": [
-			"phpunit"
-		],
 		"test-e2e": [
 			"@wp-test-ensure-env @no_additional_args",
 			"rm -f tests/e2e/package.json tests/e2e/node_modules @no_additional_args",

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/readme.txt

@@ -15,8 +15,6 @@ SQLite integration plugin by the WordPress Team.
 
 The SQLite plugin is a community, feature plugin. The intent is to allow testing an SQLite integration with WordPress and gather feedback, with the goal of eventually landing it in WordPress core.
 
-This feature plugin includes code from the PHPMyAdmin project (specifically parts of the PHPMyAdmin/sql-parser library), licensed under the GPL v2 or later. More info on the PHPMyAdmin/sql-parser library can be found on [GitHub](https://github.com/phpmyadmin/sql-parser).
-
 == Frequently Asked Questions ==
 
 = What is the purpose of this plugin? =

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] ) ) {
@@ -175,28 +171,6 @@ public function _real_escape( $data ) {
 		return $this->add_placeholder_escape( $escaped );
 	}
 
-	/**
-	 * Method to dummy out wpdb::esc_like() function.
-	 *
-	 * WordPress 4.0.0 introduced esc_like() function that adds backslashes to %,
-	 * underscore and backslash, which is not interpreted as escape character
-	 * by SQLite. So we override it and dummy out this function.
-	 *
-	 * @param string $text The raw text to be escaped. The input typed by the user should have no
-	 *                     extra or deleted slashes.
-	 *
-	 * @return string Text in the form of a LIKE phrase. The output is not SQL safe. Call $wpdb::prepare()
-	 *                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;
-	}
-
 	/**
 	 * Prints SQL/DB error.
 	 *
@@ -326,34 +300,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 +435,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 +480,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 +505,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 +529,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'],
+			);
 		}
 	}