Changeset 37939 for branches/4.2/src/wp-admin/includes/upgrade.php

Timestamp:

07/01/2016 11:50:08 AM (8 years ago)

Author:

pento

Message:

Database: dbDelta() will no longer try to downgrade the size of TEXT and BLOB columns.

When upgrading to utf8mb4, TEXT fields will be upgraded to MEDIUMTEXT (and likewise for all other *TEXT and *BLOB fields). This is to allow for the additional space requirements of utf8mb4.

On the subsequent upgrade, dbDelta() would try and downgrade the fields to their original size again. At best, this it a waste of time, at worst, this could truncate any data larger than the original size. There's no harm in leaving them at their new size, so let's do that.

The FULLTEXT indexes are removed from the tests, as dbDelta()'s FULLTEXT support was added in WordPress 4.4.

This also includes the setUp() and tearDown() parts of [32270], to allow the tests to run, and fixes a typo them.

Merge of [37525] to the 4.2 branch.
Partial merge of [36552] to the 4.2 branch.
Partial merge of [32270] to the 4.2 branch.

See #36748.

File:

• branches/4.2/src/wp-admin/includes/upgrade.php (modified) (2 diffs)

branches/4.2/src/wp-admin/includes/upgrade.php

@@ -1950 +1950 @@
     $iqueries = apply_filters( 'dbdelta_insert_queries', $iqueries );
 
+    $text_fields = array( 'tinytext', 'text', 'mediumtext', 'longtext' );
+    $blob_fields = array( 'tinyblob', 'blob', 'mediumblob', 'longblob' );
+
     $global_tables = $wpdb->tables( 'global' );
     foreach ( $cqueries as $table => $qry ) {
@@ -2019 +2022 @@
                 // Is actual field type different from the field type in query?
                 if ($tablefield->Type != $fieldtype) {
+                    $do_change = true;
+                    if ( in_array( strtolower( $fieldtype ), $text_fields ) && in_array( strtolower( $tablefield->Type ), $text_fields ) ) {
+                        if ( array_search( strtolower( $fieldtype ), $text_fields ) < array_search( strtolower( $tablefield->Type ), $text_fields ) ) {
+                            $do_change = false;
+                        }
+                    }
+
+                    if ( in_array( strtolower( $fieldtype ), $blob_fields ) && in_array( strtolower( $tablefield->Type ), $blob_fields ) ) {
+                        if ( array_search( strtolower( $fieldtype ), $blob_fields ) < array_search( strtolower( $tablefield->Type ), $blob_fields ) ) {
+                            $do_change = false;
+                        }
+                    }
+
+                    if ( $do_change ) {
                     // Add a query to change the column type
-                    $cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN {$tablefield->Field} " . $cfields[strtolower($tablefield->Field)];
-                    $for_update[$table.'.'.$tablefield->Field] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";
+                        $cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN {$tablefield->Field} " . $cfields[strtolower($tablefield->Field)];
+                        $for_update[$table.'.'.$tablefield->Field] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";
+                    }
                 }