<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[38591] trunk: Database: Normalise index names in `dbDelta()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38591">38591</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38591","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-09-12 05:08:17 +0000 (Mon, 12 Sep 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Database: Normalise index names in `dbDelta()`.
When comparing index definitions, normalise the index names to lower case, as they are not case sensitive within MySQL.
Fixes <a href="https://core.trac.wordpress.org/ticket/34874">#34874</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunktestsphpunittestsdbdeltaphp">trunk/tests/phpunit/tests/dbdelta.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2016-09-12 02:27:55 UTC (rev 38590)
+++ trunk/src/wp-admin/includes/upgrade.php 2016-09-12 05:08:17 UTC (rev 38591)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2283,7 +2283,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $index_type = str_replace( 'INDEX', 'KEY', $index_type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Escape the index name with backticks. An index for a primary key has no name.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $index_name = ( 'PRIMARY KEY' === $index_type ) ? '' : '`' . $index_matches['index_name'] . '`';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $index_name = ( 'PRIMARY KEY' === $index_type ) ? '' : '`' . strtolower( $index_matches['index_name'] ) . '`';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse the columns. Multiple columns are separated by a comma.
</span><span class="cx" style="display: block; padding: 0 10px"> $index_columns = array_map( 'trim', explode( ',', $index_matches['index_columns'] ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2407,7 +2407,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ($tableindices as $tableindex) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the index to the index data array.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $keyname = $tableindex->Key_name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $keyname = strtolower( $tableindex->Key_name );
</ins><span class="cx" style="display: block; padding: 0 10px"> $index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part);
</span><span class="cx" style="display: block; padding: 0 10px"> $index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0)?true:false;
</span><span class="cx" style="display: block; padding: 0 10px"> $index_ary[$keyname]['index_type'] = $tableindex->Index_type;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2418,7 +2418,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Build a create string to compare to the query.
</span><span class="cx" style="display: block; padding: 0 10px"> $index_string = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ($index_name == 'PRIMARY') {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($index_name == 'primary') {
</ins><span class="cx" style="display: block; padding: 0 10px"> $index_string .= 'PRIMARY ';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $index_data['unique'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $index_string .= 'UNIQUE ';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2430,7 +2430,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $index_string .= 'SPATIAL ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $index_string .= 'KEY ';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'PRIMARY' !== $index_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'primary' !== $index_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $index_string .= '`' . $index_name . '`';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $index_columns = '';
</span></span></pre></div>
<a id="trunktestsphpunittestsdbdeltaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/dbdelta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dbdelta.php 2016-09-12 02:27:55 UTC (rev 38590)
+++ trunk/tests/phpunit/tests/dbdelta.php 2016-09-12 05:08:17 UTC (rev 38591)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -803,6 +803,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 34874
+ */
+ function test_key_names_are_not_case_sensitive_and_do_not_recreate_indices() {
+ global $wpdb;
+
+ $updates = dbDelta(
+ "
+ CREATE TABLE {$wpdb->prefix}dbdelta_test (
+ id bigint(20) NOT NULL AUTO_INCREMENT,
+ column_1 varchar(255) NOT NULL,
+ column_2 text,
+ column_3 blob,
+ PRIMARY KEY (id),
+ KEY KEY_1 (column_1),
+ KEY compOUND_key (id,column_1),
+ FULLTEXT KEY FULLtext_kEY (column_1)
+ ) ENGINE=MyISAM
+ ", false );
+
+ $this->assertEmpty( $updates );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 31679
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_column_type_change_with_hyphens_in_name() {
</span></span></pre>
</div>
</div>
</body>
</html>