Use correct PDO exception and code when table not found

Author: JanJakes

wp-includes/sqlite-ast/class-wp-sqlite-driver-exception.php

@@ -1,20 +1,29 @@
 <?php
 
-class WP_SQLite_Driver_Exception extends Exception {
+class WP_SQLite_Driver_Exception extends PDOException {
 	/**
 	 * The SQLite driver that originated the exception.
 	 *
 	 * @var WP_SQLite_Driver
 	 */
 	private $driver;
 
+	/**
+	 * Constructor.
+	 *
+	 * @param WP_SQLite_Driver $driver   The SQLite driver that originated the exception.
+	 * @param string           $message  The exception message.
+	 * @param int|string       $code     The exception code. In PDO, it can be a string with value of SQLSTATE.
+	 * @param Throwable|null   $previous The previous throwable used for the exception chaining.
+	 */
 	public function __construct(
 		WP_SQLite_Driver $driver,
 		string $message,
-		int $code = 0,
+		$code = 0,
 		Throwable $previous = null
 	) {
-		parent::__construct( $message, $code, $previous );
+		parent::__construct( $message, 0, $previous );
+		$this->code   = $code;
 		$this->driver = $driver;
 	}
 

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

@@ -1496,7 +1496,7 @@ private function execute_show_columns_statement( WP_Parser_Node $node ): void {
 		)->fetchColumn();
 
 		if ( ! $table_exists ) {
-			throw new PDOException(
+			throw $this->new_driver_exception(
 				sprintf( "Table '%s.%s' doesn't exist", $database, $table_name ),
 				'42S02'
 			);
@@ -2499,7 +2499,8 @@ private function get_sqlite_create_table_statement( string $table_name, ?string
 
 		if ( false === $table_info ) {
 			throw $this->new_driver_exception(
-				sprintf( 'Table "%s" not found in information schema', $table_name )
+				sprintf( "Table '%s' doesn't exist", $table_name ),
+				'42S02'
 			);
 		}
 
@@ -2909,13 +2910,13 @@ private function set_result_from_affected_rows( int $override = null ): void {
 	 * Create a new SQLite driver exception.
 	 *
 	 * @param string         $message  The exception message.
-	 * @param int            $code     The exception code.
+	 * @param int|string     $code     The exception code. For PDO errors, a string representing SQLSTATE.
 	 * @param Throwable|null $previous The previous exception.
 	 * @return WP_SQLite_Driver_Exception
 	 */
 	private function new_driver_exception(
 		string $message,
-		int $code = 0,
+		$code = 0,
 		Throwable $previous = null
 	): WP_SQLite_Driver_Exception {
 		return new WP_SQLite_Driver_Exception( $this, $message, $code, $previous );