Ticket #43589: 43589.diff

src/wp-includes/wp-db.php

@@ -2176 +2176 @@
                 $sql = "$type INTO `$table` ($fields) VALUES ($formats)";
 
                 $this->check_current_query = false;
-                return $this->query( $this->prepare( $sql, $values ) );
+
+                if ( count( $values ) ) {
+                        // Only prepare if there's actually something to prepare.
+                        $sql = $this->prepare( $sql, $values );
+                }
+
+                return $this->query( $sql );
         }
 
         /**
@@ -2249 +2255 @@
                 $sql = "UPDATE `$table` SET $fields WHERE $conditions";
 
                 $this->check_current_query = false;
-                return $this->query( $this->prepare( $sql, $values ) );
+
+                if ( count( $values ) ) {
+                        // Only prepare if there's actually something to prepare.
+                        $sql = $this->prepare( $sql, $values );
+                }
+
+                return $this->query( $sql );
         }
 
         /**

tests/phpunit/tests/db.php

@@ -1771 +1771 @@
                         ),
                 );
         }
+
+        /**
+         * @ticket 43589
+         */
+        public function test_insert_null_value_on_null_column_single() {
+                global $wpdb;
+
+                $wpdb->query( "CREATE TABLE {$wpdb->prefix}test_null_column( a INT );" );
+
+                $this->assertEquals( 1, $wpdb->insert( "{$wpdb->prefix}test_null_column", array( 'a' => null ) ) );
+                $this->assertNull( $wpdb->get_var( "SELECT a FROM {$wpdb->prefix}test_null_column" ) );
+
+                $wpdb->query( "DROP TABLE {$wpdb->prefix}test_null_column" );
+        }
+
+        /**
+         * @ticket 43589
+         */
+        public function test_update_null_value_on_null_column_single() {
+                global $wpdb;
+
+                $wpdb->query( "CREATE TABLE {$wpdb->prefix}test_null_column( a INT );" );
+                $wpdb->insert( "{$wpdb->prefix}test_null_column", array( 'a' => null ) );
+
+                $this->assertEquals( 0, $wpdb->update( "{$wpdb->prefix}test_null_column", array( 'a' => null ), array( 'a' => null ) ) );
+                $this->assertEquals( array( null ), $wpdb->get_col( "SELECT a FROM {$wpdb->prefix}test_null_column" ) );
+
+                $this->assertEquals( 1, $wpdb->update( "{$wpdb->prefix}test_null_column", array( 'a' => 2 ), array( 'a' => null ) ) );
+                $this->assertEquals( 2, $wpdb->get_var( "SELECT a FROM {$wpdb->prefix}test_null_column" ) );
+
+                $this->assertEquals( 1, $wpdb->update( "{$wpdb->prefix}test_null_column", array( 'a' => null ), array( 'a' => 2 ) ) );
+                $this->assertEquals( array( null ), $wpdb->get_col( "SELECT a FROM {$wpdb->prefix}test_null_column" ) );
+
+                $wpdb->query( "DROP TABLE {$wpdb->prefix}test_null_column" );
+        }
+
+        /**
+         * @ticket 43589
+         */
+        public function test_insert_null_value_on_not_null_column() {
+                global $wpdb;
+
+                $wpdb->query( "CREATE TABLE {$wpdb->prefix}test_not_null_column( a INT NOT NULL );" );
+
+                $wpdb->suppress_errors( true );
+
+                // Column 'a' cannot be null for query
+                $wpdb->insert( "{$wpdb->prefix}test_not_null_column", array( 'a' => null ) );
+                $this->assertNotEmpty( $wpdb->last_error );
+
+                $wpdb->suppress_errors( false );
+
+                $this->assertEmpty( $wpdb->get_col( "SELECT a FROM {$wpdb->prefix}test_not_null_column" ) );
+
+                $wpdb->query( "DROP TABLE {$wpdb->prefix}test_not_null_column" );
+        }
+
+        /**
+         * @ticket 43589
+         */
+        public function test_update_null_value_on_not_null_column() {
+                global $wpdb;
+
+                $wpdb->query( "CREATE TABLE {$wpdb->prefix}test_not_null_column( a INT NOT NULL );" );
+                $wpdb->insert( "{$wpdb->prefix}test_not_null_column", array( 'a' => 1 ) );
+
+                $this->assertEquals( 1, $wpdb->update( "{$wpdb->prefix}test_not_null_column", array( 'a' => null ), array( 'a' => 1 ) ) );
+                $this->assertNotEmpty( $wpdb->get_results( 'SHOW WARNINGS' ) );
+
+                $this->assertEquals( 0, $wpdb->get_var( "SELECT a FROM {$wpdb->prefix}test_not_null_column" ) );
+
+                $wpdb->query( "DROP TABLE {$wpdb->prefix}test_not_null_column" );
+        }
+
+        /**
+         * @ticket 43589
+         */
+        public function test_update_null_value_on_not_null_column_strict() {
+                global $wpdb;
+
+                $wpdb->query( "CREATE TABLE {$wpdb->prefix}test_not_null_column( a INT NOT NULL );" );
+                $wpdb->insert( "{$wpdb->prefix}test_not_null_column", array( 'a' => 1 ) );
+
+                $mode = $wpdb->get_var( "SELECT @@sql_mode" );
+                $wpdb->query( "SET sql_mode = 'STRICT_ALL_TABLES'" );
+
+                $wpdb->suppress_errors( true );
+
+                $this->assertEquals( 0, $wpdb->update( "{$wpdb->prefix}test_not_null_column", array( 'a' => null ), array( 'a' => 1 ) ) );
+                $this->assertNotEmpty( $wpdb->last_error );
+
+                $wpdb->suppress_errors( false );
+
+                $this->assertEquals( 1, $wpdb->get_var( "SELECT a FROM {$wpdb->prefix}test_not_null_column" ) );
+
+                $wpdb->query( $wpdb->prepare( "SET sql_mode = %s", $mode ) );
+                $wpdb->query( "DROP TABLE {$wpdb->prefix}test_not_null_column" );
+        }
 }