Ticket #41956: 41956.3.diff

src/wp-includes/wp-db.php

@@ -77 +77 @@
         public $last_error = '';
 
         /**
+         * The last error code during query.
+         * @since
+         * @var int
+         */
+        protected $last_err_no = 0;
+
+        /**
+         * The last error message during query.
+         *
+         * @var string
+         */
+        protected $last_err_msg = '';
+
+        /**
          * Amount of queries made
          *
          * @since 1.2.0
@@ -1311 +1325 @@
         public function print_error( $str = '' ) {
                 global $EZSQL_ERROR;
 
-                if ( !$str ) {
-                        if ( $this->use_mysqli ) {
-                                $str = mysqli_error( $this->dbh );
-                        } else {
-                                $str = mysql_error( $this->dbh );
-                        }
+                if ( '' === $str ) {
+                        $str = $this->last_err_msg;
                 }
-                $EZSQL_ERROR[] = array( 'query' => $this->last_query, 'error_str' => $str );
+                $EZSQL_ERROR[] = array( 'query' => $this->last_query, 'error_str' => $str, 'error_no' => $this->last_err_no );
 
                 if ( $this->suppress_errors )
                         return false;
@@ -1368 +1378 @@
         }
 
         /**
+         * Retrieve error code from the last database error.
+         *
+         * @since
+         * @return int Error code, Zero on no error has occurred.
+         */
+        public function get_err_no(){
+                return $this->last_err_no;
+        }
+
+        /**
+         * Retrieve error message from the last database error.
+         *
+         * @since
+         * @return string Error message, empty string on no error has occurred.
+         */
+        public function get_err_msg(){
+                return $this->last_err_msg;
+        }
+
+        /**
+         * Retrieve error info from the last database error.
+         *
+         * @since
+         * @return array|bool Array containing error no and message, false on no error has occurred.
+         */
+        public function get_last_error(){
+                if ( $this->last_err_no > 0 ){
+                        return array(
+                                'error_no' => $this->last_err_no,
+                                'error_message' => $this->last_err_msg,
+                        );
+                } else {
+                        return false;
+                }
+        }
+
+        /**
          * Enables showing of database errors.
          *
          * This function should be used only to enable showing of errors.
@@ -1426 +1473 @@
          * @since 0.71
          */
         public function flush() {
-                $this->last_result = array();
-                $this->col_info    = null;
-                $this->last_query  = null;
+                $this->last_result   = array();
+                $this->col_info      = null;
+                $this->last_query    = null;
                 $this->rows_affected = $this->num_rows = 0;
-                $this->last_error  = '';
+                $this->last_err_no   = 0;
+                $this->last_err_msg  = '';
+                $this->last_error    = '';
 
                 if ( $this->use_mysqli && $this->result instanceof mysqli_result ) {
                         mysqli_free_result( $this->result );
@@ -1772 +1821 @@
                 $this->_do_query( $query );
 
                 // MySQL server has gone away, try to reconnect.
-                $mysql_errno = 0;
+                $this->last_err_no = 0;
                 if ( ! empty( $this->dbh ) ) {
                         if ( $this->use_mysqli ) {
                                 if ( $this->dbh instanceof mysqli ) {
-                                        $mysql_errno = mysqli_errno( $this->dbh );
+                                        $this->last_err_no = mysqli_errno( $this->dbh );
                                 } else {
                                         // $dbh is defined, but isn't a real connection.
                                         // Something has gone horribly wrong, let's try a reconnect.
-                                        $mysql_errno = 2006;
+                                        $this->last_err_no = 2006;
                                 }
                         } else {
                                 if ( is_resource( $this->dbh ) ) {
-                                        $mysql_errno = mysql_errno( $this->dbh );
+                                        $this->last_err_no = mysql_errno( $this->dbh );
                                 } else {
-                                        $mysql_errno = 2006;
+                                        $this->last_err_no = 2006;
                                 }
                         }
                 }
 
-                if ( empty( $this->dbh ) || 2006 == $mysql_errno ) {
+                if ( empty( $this->dbh ) || 2006 == $this->last_err_no ) {
                         if ( $this->check_connection() ) {
                                 $this->_do_query( $query );
                         } else {
@@ -1798 +1847 @@
                                 $this->insert_id = 0;
                                 return false;
                         }
-                }
-
-                // If there is an error then take note of it.
-                if ( $this->use_mysqli ) {
-                        if ( $this->dbh instanceof mysqli ) {
-                                $this->last_error = mysqli_error( $this->dbh );
+                } elseif ( 0 !== $this->last_err_no ) {
+                        // If there is an error then take note of it.
+                        if ( $this->use_mysqli ) {
+                                if ( $this->dbh instanceof mysqli ) {
+                                        $this->last_error   = mysqli_error( $this->dbh );
+                                        $this->last_err_msg = mysqli_error( $this->dbh );
+                                } else {
+                                        $this->last_error = __( 'Unable to retrieve the error message from MySQL' );
+                                }
                         } else {
-                                $this->last_error = __( 'Unable to retrieve the error message from MySQL' );
+                                if ( is_resource( $this->dbh ) ) {
+                                        $this->last_error   = mysql_error( $this->dbh );
+                                        $this->last_err_msg = mysql_error( $this->dbh );
+                                } else {
+                                        $this->last_error = __( 'Unable to retrieve the error message from MySQL' );
+                                }
                         }
-                } else {
-                        if ( is_resource( $this->dbh ) ) {
-                                $this->last_error = mysql_error( $this->dbh );
-                        } else {
-                                $this->last_error = __( 'Unable to retrieve the error message from MySQL' );
-                        }
-                }
 
-                if ( $this->last_error ) {
                         // Clear insert_id on a subsequent failed insert.
                         if ( $this->insert_id && preg_match( '/^\s*(insert|replace)\s/i', $query ) )
                                 $this->insert_id = 0;