Ticket #21663: 21663-PDO-merge.diff

src/wp-includes/wp-db.php

@@ -510 +510 @@
         public $is_mysql = null;
 
         /**
+         * Array of fetched rows.
+         * PDO doesn't have a "count rows" feature, so we have to fetch the rows
+         * up front, and cache them here
+         *
+         * @since 3.8.0
+         * @var array
+         */
+        private $fetched_rows = array();
+
+        /**
          * Connects to the database server and selects a database
          *
          * PHP5 style constructor for compatibility with PHP5. Does
@@ -636 +646 @@
                         $charset = $this->charset;
                 if ( ! isset( $collate ) )
                         $collate = $this->collate;
-                if ( $this->has_cap( 'collation' ) && ! empty( $charset ) ) {
-                        if ( function_exists( 'mysql_set_charset' ) && $this->has_cap( 'set_charset' ) ) {
-                                mysql_set_charset( $charset, $dbh );
-                        } else {
-                                $query = $this->prepare( 'SET NAMES %s', $charset );
-                                if ( ! empty( $collate ) )
-                                        $query .= $this->prepare( ' COLLATE %s', $collate );
-                                mysql_query( $query, $dbh );
-                        }
+                if ( $this->has_cap( 'collation', $dbh ) && !empty( $charset ) ) {
+                        $query = $this->prepare( 'SET NAMES %s', $charset );
+                        if ( ! empty( $collate ) )
+                                $query .= $this->prepare( ' COLLATE %s', $collate );
+                        $this->dbh->query( $query );
                 }
         }
 
@@ -827 +833 @@
          * @return null Always null.
          */
         function select( $db, $dbh = null ) {
-                if ( is_null($dbh) )
-                        $dbh = $this->dbh;
+                if ( $dbh instanceof PDO ) {
+                        $result = true;
+                        try {
+                                $dbh->exec( sprintf( 'USE `%s`', $db ) );
+                        } catch ( Exception $e ) {
+                                $result = false;
+                        }
+                } else {
+                        $result = $dbh->select( $db );
+                }
 
-                if ( !@mysql_select_db( $db, $dbh ) ) {
+                if ( ! $result ) {
                         $this->ready = false;
                         wp_load_translations_early();
                         $this->bail( sprintf( __( '<h1>Can&#8217;t select database</h1>
@@ -876 +890 @@
          * @return string escaped
          */
         function _real_escape( $string ) {
-                if ( $this->dbh )
-                        return mysql_real_escape_string( $string, $this->dbh );
-
-                $class = get_class( $this );
-                _doing_it_wrong( $class, "$class must set a database connection for use with escaping.", E_USER_NOTICE );
-                return addslashes( $string );
+                return substr( $this->dbh->quote( $string ), 1, -1 );
         }
 
         /**
@@ -1019 +1028 @@
                 global $EZSQL_ERROR;
 
                 if ( !$str )
-                        $str = mysql_error( $this->dbh );
+                        $str = $this->get_error_message();
                 $EZSQL_ERROR[] = array( 'query' => $this->last_query, 'error_str' => $str );
 
                 if ( $this->suppress_errors )
@@ -1116 +1125 @@
          * @return void
          */
         function flush() {
+                if ( $this->result instanceof PDOStatement )
+                        $this->result->closeCursor();
+                $this->result = null;
+                $this->col_info = null;
+                $this->fetched_rows = array();
                 $this->last_result = array();
-                $this->col_info    = null;
                 $this->last_query  = null;
                 $this->rows_affected = $this->num_rows = 0;
                 $this->last_error  = '';
+        }
 
-                if ( is_resource( $this->result ) )
-                        mysql_free_result( $this->result );
+        /**
+         * Connect to database
+         * @return bool
+         */
+        public function connect( $host, $user, $pass, $port = 3306, $options = array() ) {
+                $dsn = sprintf( 'mysql:host=%1$s;port=%2$d', $host, $port );
+
+                try {
+                        $pdo_options = array();
+
+                        if ( ! empty( $options['key'] ) && ! empty( $options['cert'] ) && ! empty( $options['ca'] ) ) {
+                                $pdo_options[ PDO::MYSQL_ATTR_SSL_KEY ]    = $options['key'];
+                                $pdo_options[ PDO::MYSQL_ATTR_SSL_CERT ]   = $options['cert'];
+                                $pdo_options[ PDO::MYSQL_ATTR_SSL_CA ]     = $options['ca'];
+                                $pdo_options[ PDO::MYSQL_ATTR_SSL_CAPATH ] = $options['ca_path'];
+                                $pdo_options[ PDO::MYSQL_ATTR_SSL_CIPHER ] = $options['cipher'];
+
+                                // Cleanup empty values
+                                $pdo_options = array_filter( $pdo_options );
+                        }
+
+                        $this->dbh = new PDO( $dsn, $user, $pass, $pdo_options );
+                        $this->dbh->setAttribute ( PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION );
+                } catch ( Exception $e ) {
+                        return false;
+                }
+
+                return true;
         }
 
         /**
@@ -1132 +1172 @@
          * @since 3.0.0
          */
         function db_connect() {
-
                 $this->is_mysql = true;
 
-                $new_link = defined( 'MYSQL_NEW_LINK' ) ? MYSQL_NEW_LINK : true;
-                $client_flags = defined( 'MYSQL_CLIENT_FLAGS' ) ? MYSQL_CLIENT_FLAGS : 0;
-
-                if ( WP_DEBUG ) {
-                        $this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
-                } else {
-                        $this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
+                if ( false !== strpos( $this->dbhost, ':' ) ) {
+                        list( $host, $port ) = explode( ':', $this->dbhost );
+                } else {
+                        $host = $this->dbhost;
+                        $port = 3306;
                 }
 
-                if ( !$this->dbh ) {
+                $options = array();
+                $options['key'] = defined( 'DB_SSL_KEY' ) ? DB_SSL_KEY : null;
+                $options['cert'] = defined( 'DB_SSL_CERT' ) ? DB_SSL_CERT : null;
+                $options['ca'] = defined( 'DB_SSL_CA' ) ? DB_SSL_CA : null;
+                $options['ca_path'] = defined( 'DB_SSL_CA_PATH' ) ? DB_SSL_CA_PATH : null;
+                $options['cipher'] = defined( 'DB_SSL_CIPHER' ) ? DB_SSL_CIPHER : null;
+
+                if ( ! $this->connect( $host, $this->dbuser, $this->dbpassword, $port, $options ) ) {
                         wp_load_translations_early();
                         $this->bail( sprintf( __( "
 <h1>Error establishing a database connection</h1>
@@ -1168 +1212 @@
         }
 
         /**
+         * Get last insert id
+         *
+         * @since 3.8.0
+         *
+         * @return int
+         */
+        public function insert_id() {
+                return $this->dbh->lastInsertId();
+        }
+
+        /**
+         * Get the latest error message from the DB driver
+         *
+         * @since 3.8.0
+         *
+         * @return string
+         */
+        public function get_error_message() {
+                $error = $this->dbh->errorInfo();
+                if ( isset( $error[2] ) ) {
+                        return $error[2];
+                }
+                return '';
+        }
+
+        /**
+         * Get results
+         *
+         * @since 3.8.0
+         *
+         * @return array
+         */
+        public function pdo_get_results() {
+                if ( ! empty( $this->fetched_rows ) ) {
+                        return $this->fetched_rows;
+                }
+                $this->fetched_rows = array();
+
+                if ( ! empty( $this->result ) && $this->result->rowCount() > 0 ) {
+                        try {
+                                while ( $row = $this->result->fetchObject() )
+                                        $this->fetched_rows[] = $row;
+                        } catch ( Exception $e ) {}
+                }
+
+                return $this->fetched_rows;
+        }
+
+        /**
          * Perform a MySQL database query, using current database connection.
          *
          * More information can be found on the codex page.
@@ -1180 +1273 @@
         function query( $query ) {
                 if ( ! $this->ready )
                         return false;
-                /**
-                 * Filter the database query.
-                 *
-                 * Some queries are made before the plugins have been loaded, and thus cannot be filtered with this method.
-                 *
-                 * @since 2.1.0
-                 * @param string $query Database query.
-                 */
+
+                // some queries are made before the plugins have been loaded, and thus cannot be filtered with this method
                 $query = apply_filters( 'query', $query );
 
                 $return_val = 0;
@@ -1202 +1289 @@
                 if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES )
                         $this->timer_start();
 
-                $this->result = @mysql_query( $query, $this->dbh );
+                try {
+                        $this->result = $this->dbh->query( $query );
+                } catch ( Exception $e ) {
+                        if ( WP_DEBUG ) {
+                                error_log( 'Error executing query: ' . $e->getCode() . ' - ' . $e->getMessage() . ' in query ' . $query );
+                        }
+                        return $return_val;
+                }
+
                 $this->num_queries++;
 
                 if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES )
                         $this->queries[] = array( $query, $this->timer_stop(), $this->get_caller() );
 
                 // If there is an error then take note of it..
-                if ( $this->last_error = mysql_error( $this->dbh ) ) {
-                        // Clear insert_id on a subsequent failed insert.
-                        if ( $this->insert_id && preg_match( '/^\s*(insert|replace)\s/i', $query ) )
-                                $this->insert_id = 0;
-
+                if ( $this->last_error = $this->get_error_message() ) {
                         $this->print_error();
                         return false;
                 }
@@ -1221 +1312 @@
                 if ( preg_match( '/^\s*(create|alter|truncate|drop)\s/i', $query ) ) {
                         $return_val = $this->result;
                 } elseif ( preg_match( '/^\s*(insert|delete|update|replace)\s/i', $query ) ) {
-                        $this->rows_affected = mysql_affected_rows( $this->dbh );
+                        $this->rows_affected = $this->affected_rows();
                         // Take note of the insert_id
                         if ( preg_match( '/^\s*(insert|replace)\s/i', $query ) ) {
-                                $this->insert_id = mysql_insert_id($this->dbh);
+                                $this->insert_id = $this->insert_id();
                         }
                         // Return number of rows affected
                         $return_val = $this->rows_affected;
+                } elseif ( preg_match( '/^\s*select\s/i', $query ) ) {
+                        $this->get_results();
+                        $return_val = count( $this->fetched_rows );
                 } else {
-                        $num_rows = 0;
-                        while ( $row = @mysql_fetch_object( $this->result ) ) {
-                                $this->last_result[$num_rows] = $row;
-                                $num_rows++;
-                        }
-
-                        // Log number of rows the query returned
-                        // and return number of rows selected
-                        $this->num_rows = $num_rows;
-                        $return_val     = $num_rows;
+                        $return_val = $this->num_rows = count( $this->result );
                 }
 
+                $this->last_result = $this->pdo_get_results();
+
                 return $return_val;
         }
 
@@ -1564 +1651 @@
         }
 
         /**
+         * Get number of rows affected
+         *
+         * @since 3.8.0
+         *
+         * @return int
+         */
+        public function affected_rows() {
+                if ( $this->result instanceof PDOStatement )
+                        return $this->result->rowCount();
+
+                return 0;
+        }
+
+        /**
          * Load the column metadata from the last query.
          *
          * @since 3.5.0
@@ -1572 +1673 @@
          */
         protected function load_col_info() {
                 if ( $this->col_info )
-                        return;
-
-                for ( $i = 0; $i < @mysql_num_fields( $this->result ); $i++ ) {
-                        $this->col_info[ $i ] = @mysql_fetch_field( $this->result, $i );
+                        return $this->col_info;
+                for ( $i = 0; $i < $this->result->columnCount() ; $i++ ) {
+                        $this->col_info[ $i ] = $this->result->fetchColumn( $i );
                 }
         }
 
@@ -1747 +1847 @@
          * @return false|string false on failure, version number on success
          */
         function db_version() {
-                return preg_replace( '/[^0-9.].*/', '', mysql_get_server_info( $this->dbh ) );
+                return preg_replace( '/[^0-9.].*/', '', $this->dbh->getAttribute( PDO::ATTR_SERVER_VERSION ) );
         }
-}
+
+        /**
+         * Don't save any state.  The db wrapper should call connect() again.
+         *
+         * @since 3.8.0
+         *
+         * @return array
+         */
+        public function __sleep() {
+                return array();
+        }
+}
+ No newline at end of file