Move application ID to WP_SQLite_DB class

Author: zaerl

constants.php

@@ -52,16 +52,6 @@
 	}
 }
 
-/**
- * The application ID identifying an SQLite database created by this driver.
- *
- * This value is stored in the SQLite database file header and can be used to
- * identify databases managed by this driver.
- *
- * See: https://www.sqlite.org/pragma.html#pragma_application_id
- */
-define( 'SQLITE_DB_APPLICATION_ID', 3948349 );
-
 // 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 );

tests/WP_SQLite_Driver_Tests.php

@@ -15,7 +15,12 @@ public function setUp(): void {
 		$this->sqlite = new $pdo_class( 'sqlite::memory:' );
 
 		$this->engine = new WP_SQLite_Driver(
-			new WP_SQLite_Connection( array( 'pdo' => $this->sqlite ) ),
+			new WP_SQLite_Connection(
+				array(
+					'pdo'            => $this->sqlite,
+					'application_id' => 42, // Test application ID.
+				)
+			),
 			'wp'
 		);
 		$this->engine->query(
@@ -53,7 +58,7 @@ private function assertQueryError( $sql, $error_message ) {
 
 	public function testApplicationID() {
 		$app_id = $this->sqlite->query( 'PRAGMA application_id' )->fetchColumn();
-		$this->assertSame( SQLITE_DB_APPLICATION_ID, (int) $app_id );
+		$this->assertSame( 42, (int) $app_id );
 	}
 
 	public function testRegexp() {

tests/WP_SQLite_Translator_Tests.php

@@ -57,11 +57,6 @@ private function assertQuery( $sql, $error_substring = null ) {
 		return $retval;
 	}
 
-	public function testApplicationID() {
-		$app_id = $this->sqlite->query( 'PRAGMA application_id' )->fetchColumn();
-		$this->assertSame( SQLITE_DB_APPLICATION_ID, (int) $app_id );
-	}
-
 	public function testRegexp() {
 		$this->assertQuery(
 			"INSERT INTO _options (option_name, option_value) VALUES ('rss_0123456789abcdef0123456789abcdef', '1');"

wp-includes/sqlite-ast/class-wp-sqlite-connection.php

@@ -63,6 +63,7 @@ class WP_SQLite_Connection {
 	 *     @type int|null    $timeout      Optional. SQLite timeout in seconds.
 	 *                                     The time to wait for a writable lock.
 	 *     @type string|null $journal_mode Optional. SQLite journal mode.
+	 *     @type int|null $application_id  Optional. SQLite application ID.
 	 * }
 	 *
 	 * @throws InvalidArgumentException When some connection options are invalid.
@@ -97,8 +98,9 @@ public function __construct( array $options ) {
 			$this->query( 'PRAGMA journal_mode = ' . $journal_mode );
 		}
 
-		// Set the application ID to identify this as a WordPress SQLite database.
-		$this->query( 'PRAGMA application_id = ' . SQLITE_DB_APPLICATION_ID );
+		if ( isset( $options['application_id'] ) ) {
+			$this->query( 'PRAGMA application_id = ' . (int) $options['application_id'] );
+		}
 	}
 
 	/**

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

@@ -30,6 +30,13 @@ class WP_SQLite_DB extends wpdb {
 	 */
 	private $allow_unsafe_unquoted_parameters = true;
 
+	/**
+	 * The application ID for the SQLite database.
+	 *
+	 * @see https://www.sqlite.org/pragma.html#pragma_application_id
+	 */
+	const SQLITE_DB_APPLICATION_ID = 3948349;
+
 	/**
 	 * Connects to the SQLite database.
 	 *
@@ -343,9 +350,10 @@ public function db_connect( $allow_bail = true ) {
 			try {
 				$connection      = new WP_SQLite_Connection(
 					array(
-						'pdo'          => $pdo,
-						'path'         => FQDB,
-						'journal_mode' => defined( 'SQLITE_JOURNAL_MODE' ) ? SQLITE_JOURNAL_MODE : null,
+						'pdo'            => $pdo,
+						'path'           => FQDB,
+						'journal_mode'   => defined( 'SQLITE_JOURNAL_MODE' ) ? SQLITE_JOURNAL_MODE : null,
+						'application_id' => self::SQLITE_DB_APPLICATION_ID,
 					)
 				);
 				$this->dbh       = new WP_SQLite_Driver( $connection, $this->dbname );

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

@@ -427,9 +427,6 @@ public function __construct( $pdo = null ) {
 		if ( defined( 'SQLITE_JOURNAL_MODE' ) && in_array( SQLITE_JOURNAL_MODE, $valid_journal_modes, true ) ) {
 			$this->pdo->query( 'PRAGMA journal_mode = ' . SQLITE_JOURNAL_MODE );
 		}
-
-		// Set the application ID to identify this as a WordPress SQLite database.
-		$this->pdo->query( 'PRAGMA application_id = ' . SQLITE_DB_APPLICATION_ID );
 	}
 
 	/**