Ticket #32315: 32315.2.diff

src/wp-includes/wp-db.php

@@ -1208 +1208 @@
          * This method DOES NOT support sign, padding, alignment, width or precision specifiers.
          * This method DOES NOT support argument numbering or swapping.
          *
-         * Arguments may be passed as individual arguments to the method, or as a single array containing all arguments. A combination 
+         * Arguments may be passed as individual arguments to the method, or as a single array containing all arguments. A combination
          * of the two is not supported.
          *
          * Examples:
@@ -1762 +1762 @@
                         $this->flush();
                         if ( $stripped_query !== $query ) {
                                 $this->insert_id = 0;
+                                $this->last_query = $query;
+                                $this->last_error = __( 'WordPress Database Error: Could not perform query because it contains invalid data.' );
                                 return false;
                         }
                 }
@@ -2064 +2066 @@
                 $conditions = implode( ' AND ', $conditions );
 
                 $sql = "UPDATE `$table` SET $fields WHERE $conditions";
-                
+
                 $this->check_current_query = false;
                 return $this->query( $this->prepare( $sql, $values ) );
         }
@@ -2156 +2158 @@
                 $converted_data = $this->strip_invalid_text( $data );
 
                 if ( $data !== $converted_data ) {
+                        $problem_fields = array();
+
+                        foreach ( $data as $field => $value ) {
+                                if ( $value !== $converted_data[ $field ] ) {
+                                        $problem_fields[] = $field;
+                                }
+                        }
+
+                        if ( count( $problem_fields ) === 1 ) {
+                                $message = __( 'WordPress Database Error: Processing the value for the following field failed, the supplied value may have been too long or contained invalid data: %s.' );
+                        } else {
+                                $message = __( 'WordPress Database Error: Processing the values for the following fields failed, the supplied values may have been too long or contained invalid data: %s.' );
+                        }
+
+                        $this->last_error = sprintf( $message, implode( ', ', $problem_fields ) );
                         return false;
                 }
 

tests/phpunit/tests/db.php

@@ -31 +31 @@
                 parent::setUp();
                 $this->_queries = array();
                 add_filter( 'query', array( $this, 'query_filter' ) );
+                self::$_wpdb->last_error = null;
+                $GLOBALS['wpdb']->last_error = null;
         }
 
         /**
@@ -939 +941 @@
         }
 
         /**
+         * @ticket 32315
+         *
+         * @dataProvider data_process_fields_invalid_data
+         */
+        function test_process_fields_value_too_long_for_field( $data ) {
+
+                global $wpdb;
+
+                $this->assertFalse( self::$_wpdb->process_fields( $wpdb->posts, $data, null ) );
+                $this->assertSame(
+                        'WordPress Database Error: Processing the value for the following field failed, the supplied value may have been too long or contained invalid data: post_status.',
+                        self::$_wpdb->last_error
+                );
+        }
+
+        function data_process_fields_invalid_data() {
+                return array(
+                        'too_long'      => array( array( 'post_status' => str_repeat( 'a', 21 ) ) ),
+                        'invalid_chars' => array( array( 'post_status' => "\xF5" ) ),
+                );
+        }
+
+        /**
+         * @ticket 32315
+         */
+        function test_process_fields_value_too_long_for_field_multiple() {
+
+                global $wpdb;
+
+                $data = array(
+                        'post_status'  => str_repeat( 'a', 21 ),
+                        'post_content' => "\xF5",
+                );
+
+                $this->assertFalse( self::$_wpdb->process_fields( $wpdb->posts, $data, null ) );
+                $this->assertSame(
+                        'WordPress Database Error: Processing the values for the following fields failed, the supplied values may have been too long or contained invalid data: post_status, post_content.',
+                        self::$_wpdb->last_error
+                );
+        }
+
+        /**
+         * @ticket 32315
+         *
+         * @dataProvider data_process_fields_invalid_data
+         */
+        function test_insert_value_too_long_for_field( $data ) {
+
+                global $wpdb;
+
+                $this->assertFalse( $wpdb->insert( $wpdb->posts, $data ) );
+                $this->assertSame(
+                        'WordPress Database Error: Processing the value for the following field failed, the supplied value may have been too long or contained invalid data: post_status.',
+                        $wpdb->last_error
+                );
+        }
+
+        /**
+         * @ticket 32315
+         *
+         * @dataProvider data_process_fields_invalid_data
+         */
+        function test_replace_value_too_long_for_field( $data ) {
+
+                global $wpdb;
+
+                $this->assertFalse( $wpdb->replace( $wpdb->posts, $data ) );
+                $this->assertSame(
+                        'WordPress Database Error: Processing the value for the following field failed, the supplied value may have been too long or contained invalid data: post_status.',
+                        $wpdb->last_error
+                );
+        }
+
+        /**
+         * @ticket 32315
+         *
+         * @dataProvider data_process_fields_invalid_data
+         */
+        function test_update_value_too_long_for_field( $data ) {
+
+                global $wpdb;
+
+                $this->assertFalse( $wpdb->update( $wpdb->posts, $data, array() ) );
+                $this->assertSame(
+                        'WordPress Database Error: Processing the value for the following field failed, the supplied value may have been too long or contained invalid data: post_status.',
+                        $wpdb->last_error
+                );
+        }
+
+        /**
+         * @ticket 32315
+         *
+         * @dataProvider data_process_fields_invalid_data
+         */
+        function test_delete_value_too_long_for_field( $data ) {
+
+                global $wpdb;
+
+                $this->assertFalse( $wpdb->delete( $wpdb->posts, $data, array() ) );
+                $this->assertSame(
+                        'WordPress Database Error: Processing the value for the following field failed, the supplied value may have been too long or contained invalid data: post_status.',
+                        $wpdb->last_error
+                );
+        }
+
+        /**
+         * @ticket 32315
+         */
+        function test_query_value_contains_invalid_chars() {
+
+                global $wpdb;
+
+                $this->assertFalse(
+                        $wpdb->query( "INSERT INTO {$wpdb->posts} (post_status) VALUES ('\xF5')" )
+                );
+                $this->assertSame(
+                        'WordPress Database Error: Could not perform query because it contains invalid data.',
+                        $wpdb->last_error
+                );
+        }
+
+        /**
          * @ticket 15158
          */
         function test_null_insert() {