WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Database: Reduce the number of `strtolower()` calls in `dbDelta()`. 

Fixes #36919.
Built from https://develop.svn.wordpress.org/trunk@37532


git-svn-id: http://core.svn.wordpress.org/trunk@37500 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-05-23 14:58:27 +00:00
parent 15ce1ec939
commit e5a87afb29
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
wp-admin/includes/upgrade.php
View File

@ -2192,64 +2192,68 @@ function dbDelta( $queries = '', $execute = true ) {
// Extract the field name. // Extract the field name.
preg_match("|^([^ ]*)|", trim($fld), $fvals); preg_match("|^([^ ]*)|", trim($fld), $fvals);
$fieldname = trim( $fvals[1], '`' ); $fieldname = trim( $fvals[1], '`' );
$fieldname_lowercased = strtolower( $fieldname );
// Verify the found field name. // Verify the found field name.
$validfield = true; $validfield = true;
switch (strtolower($fieldname)) { switch ( $fieldname_lowercased ) {
case '': case '':
case 'primary': case 'primary':
case 'index': case 'index':
case 'fulltext': case 'fulltext':
case 'unique': case 'unique':
case 'key': case 'key':
$validfield = false; $validfield = false;
$indices[] = trim(trim($fld), ", \n"); $indices[] = trim(trim($fld), ", \n");
break; break;
} }
$fld = trim($fld); $fld = trim( $fld );
// If it's a valid field, add it to the field array. // If it's a valid field, add it to the field array.
if ($validfield) { if ( $validfield ) {
$cfields[strtolower($fieldname)] = trim($fld, ", \n"); $cfields[ $fieldname_lowercased ] = trim( $fld, ", \n" );
} }
} }
// For every field in the table. // For every field in the table.
foreach ($tablefields as $tablefield) { foreach ( $tablefields as $tablefield ) {
$tablefield_field_lowercased = strtolower( $tablefield->Field );
$tablefield_type_lowercased = strtolower( $tablefield->Type );
// If the table field exists in the field array ... // If the table field exists in the field array ...
if (array_key_exists(strtolower($tablefield->Field), $cfields)) { if ( array_key_exists( $tablefield_field_lowercased, $cfields ) ) {
// Get the field type from the query. // Get the field type from the query.
preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[strtolower($tablefield->Field)], $matches); preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[ $tablefield_field_lowercased ], $matches);
$fieldtype = $matches[1]; $fieldtype = $matches[1];
$fieldtype_lowercased = strtolower( $fieldtype );
// Is actual field type different from the field type in query? // Is actual field type different from the field type in query?
if ($tablefield->Type != $fieldtype) { if ($tablefield->Type != $fieldtype) {
$do_change = true; $do_change = true;
if ( in_array( strtolower( $fieldtype ), $text_fields ) && in_array( strtolower( $tablefield->Type ), $text_fields ) ) { if ( in_array( $fieldtype_lowercased, $text_fields ) && in_array( $tablefield_type_lowercased, $text_fields ) ) {
if ( array_search( strtolower( $fieldtype ), $text_fields ) < array_search( strtolower( $tablefield->Type ), $text_fields ) ) { if ( array_search( $fieldtype_lowercased, $text_fields ) < array_search( $tablefield_type_lowercased, $text_fields ) ) {
$do_change = false; $do_change = false;
} }
} }
if ( in_array( strtolower( $fieldtype ), $blob_fields ) && in_array( strtolower( $tablefield->Type ), $blob_fields ) ) { if ( in_array( $fieldtype_lowercased, $blob_fields ) && in_array( $tablefield_type_lowercased, $blob_fields ) ) {
if ( array_search( strtolower( $fieldtype ), $blob_fields ) < array_search( strtolower( $tablefield->Type ), $blob_fields ) ) { if ( array_search( $fieldtype_lowercased, $blob_fields ) < array_search( $tablefield_type_lowercased, $blob_fields ) ) {
$do_change = false; $do_change = false;
} }
} }
if ( $do_change ) { if ( $do_change ) {
// Add a query to change the column type // Add a query to change the column type.
$cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN {$tablefield->Field} " . $cfields[strtolower($tablefield->Field)]; $cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN {$tablefield->Field} " . $cfields[ $tablefield_field_lowercased ];
$for_update[$table.'.'.$tablefield->Field] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}"; $for_update[$table.'.'.$tablefield->Field] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";
} }
} }
// Get the default value from the array // Get the default value from the array.
// todo: Remove this? // todo: Remove this?
//echo "{$cfields[strtolower($tablefield->Field)]}<br>"; //echo "{$cfields[strtolower($tablefield->Field)]}<br>";
if (preg_match("| DEFAULT '(.*?)'|i", $cfields[strtolower($tablefield->Field)], $matches)) { if ( preg_match( "| DEFAULT '(.*?)'|i", $cfields[ $tablefield_field_lowercased ], $matches ) ) {
$default_value = $matches[1]; $default_value = $matches[1];
if ($tablefield->Default != $default_value) { if ($tablefield->Default != $default_value) {
// Add a query to change the column's default value // Add a query to change the column's default value
@ -2259,7 +2263,7 @@ function dbDelta( $queries = '', $execute = true ) {
} }
// Remove the field from the array (so it's not added). // Remove the field from the array (so it's not added).
unset($cfields[strtolower($tablefield->Field)]); unset( $cfields[ $tablefield_field_lowercased ] );
} else { } else {
// This field exists in the table, but not in the creation queries? // This field exists in the table, but not in the creation queries?
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-alpha-37531'; $wp_version = '4.6-alpha-37532';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.