<!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>[40339] trunk/tests/phpunit/tests/dbdelta.php: Tests: Use utf8mb4 max index length when creating keys.</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/40339">40339</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/40339","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jeremyfelt</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-03-27 19:33:55 +0000 (Mon, 27 Mar 2017)</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'>Tests: Use utf8mb4 max index length when creating keys.

In <a href="https://core.trac.wordpress.org/changeset/31349">[31349]</a>, core `varchar` column key lengths were changed from 255 to 191 to support the 767 byte index size limit on standard utf8mb4 MySQL installs. This changes the DB schema tests to match.

Props caseypatrickdriscoll, clarinetlord.
Fixes <a href="https://core.trac.wordpress.org/ticket/35958">#35958</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsdbdeltaphp">trunk/tests/phpunit/tests/dbdelta.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<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     2017-03-27 09:28:36 UTC (rev 40338)
+++ trunk/tests/phpunit/tests/dbdelta.php       2017-03-27 19:33:55 UTC (rev 40339)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,6 +9,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_dbDelta extends WP_UnitTestCase {
</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">+         * The maximum size of an index with utf8mb4 collation and charset with a standard
+        * byte limit of 767. floor(767/4) = 191 characters.
+        */
+       protected $max_index_length = 191;
+
+       /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Make sure the upgrade code is loaded before the tests are run.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public static function setUpBeforeClass() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,8 +40,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 blob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1($this->max_index_length)),
+                               KEY compound_key (id,column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span><span class="cx" style="display: block; padding: 0 10px">                        "
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,8 +112,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                id bigint(20) NOT NULL AUTO_INCREMENT,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1($this->max_index_length)),
+                               KEY compound_key (id,column_1($this->max_index_length))
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,8 +135,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                id int(11) NOT NULL AUTO_INCREMENT,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1($this->max_index_length)),
+                               KEY compound_key (id,column_1($this->max_index_length))
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,8 +164,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px">                                extra_col longtext,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1($this->max_index_length)),
+                               KEY compound_key (id,column_1($this->max_index_length))
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,8 +197,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><span class="cx" style="display: block; padding: 0 10px">                                id bigint(20) NOT NULL AUTO_INCREMENT,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1($this->max_index_length)),
+                               KEY compound_key (id,column_1($this->max_index_length))
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,8 +223,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px">                                extra_col longtext,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1({$this->max_index_length})),
+                               KEY compound_key (id,column_1($this->max_index_length))
</ins><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">                        , false // Don't execute.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -267,8 +273,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                id bigint(20) NOT NULL AUTO_INCREMENT,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1($this->max_index_length)),
+                               KEY compound_key (id,column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        )
</span><span class="cx" style="display: block; padding: 0 10px">                        ", false
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,8 +385,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 tinytext,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 blob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1({$this->max_index_length})),
+                               KEY compound_key (id,column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span><span class="cx" style="display: block; padding: 0 10px">                        ", false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,8 +408,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 tinyblob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1({$this->max_index_length})),
+                               KEY compound_key (id,column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span><span class="cx" style="display: block; padding: 0 10px">                        ", false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,8 +431,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 bigtext,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 blob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1({$this->max_index_length})),
+                               KEY compound_key (id,column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span><span class="cx" style="display: block; padding: 0 10px">                        ", false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,8 +458,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 mediumblob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1({$this->max_index_length})),
+                               KEY compound_key (id,column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span><span class="cx" style="display: block; padding: 0 10px">                        ", false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,7 +482,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                `id` bigint(20) NOT NULL AUTO_INCREMENT,
</span><span class="cx" style="display: block; padding: 0 10px">                                `column_1` varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY compound_key (id,column_1)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY compound_key (id,column_1($this->max_index_length))
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -548,7 +554,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                `id` bigint(20) NOT NULL AUTO_INCREMENT,
</span><span class="cx" style="display: block; padding: 0 10px">                                `references` varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (`id`),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY `compound_key` (`id`,`references`)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY `compound_key` (`id`,`references`($this->max_index_length))
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,9 +586,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 blob,
</span><span class="cx" style="display: block; padding: 0 10px">                                `references` varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id , column_1),
-                               KEY compound_key2 (id,`references`),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1($this->max_index_length)),
+                               KEY compound_key (id , column_1($this->max_index_length)),
+                               KEY compound_key2 (id,`references`($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span><span class="cx" style="display: block; padding: 0 10px">                        "
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,7 +601,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><span class="cx" style="display: block; padding: 0 10px">                                "{$wpdb->prefix}dbdelta_test.references" => "Added column {$wpdb->prefix}dbdelta_test.references",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                0 => "Added index {$wpdb->prefix}dbdelta_test KEY `compound_key2` (`id`,`references`)",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         0 => "Added index {$wpdb->prefix}dbdelta_test KEY `compound_key2` (`id`,`references`($this->max_index_length))",
</ins><span class="cx" style="display: block; padding: 0 10px">                         ),
</span><span class="cx" style="display: block; padding: 0 10px">                        $updates
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -623,12 +629,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 blob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1($this->max_index_length)),
+                               KEY compound_key (id,column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT KEY fulltext_key (column_1),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                INDEX key_2 (column_1),
-                               UNIQUE KEY key_3 (column_1),
-                               UNIQUE INDEX key_4 (column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         INDEX key_2 (column_1($this->max_index_length)),
+                               UNIQUE KEY key_3 (column_1($this->max_index_length)),
+                               UNIQUE INDEX key_4 (column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT INDEX key_5 (column_1),
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span><span class="cx" style="display: block; padding: 0 10px">                ";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -636,9 +642,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $creates = dbDelta( $schema );
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                0 => "Added index {$wpdb->prefix}dbdelta_test KEY `key_2` (`column_1`)",
-                               1 => "Added index {$wpdb->prefix}dbdelta_test UNIQUE KEY `key_3` (`column_1`)",
-                               2 => "Added index {$wpdb->prefix}dbdelta_test UNIQUE KEY `key_4` (`column_1`)",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         0 => "Added index {$wpdb->prefix}dbdelta_test KEY `key_2` (`column_1`($this->max_index_length))",
+                               1 => "Added index {$wpdb->prefix}dbdelta_test UNIQUE KEY `key_3` (`column_1`($this->max_index_length))",
+                               2 => "Added index {$wpdb->prefix}dbdelta_test UNIQUE KEY `key_4` (`column_1`($this->max_index_length))",
</ins><span class="cx" style="display: block; padding: 0 10px">                                 3 => "Added index {$wpdb->prefix}dbdelta_test FULLTEXT KEY `key_5` (`column_1`)",
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                        $creates
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -662,8 +668,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 blob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                INDEX key_1 (column_1),
-                               INDEX compound_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         INDEX key_1 (column_1($this->max_index_length)),
+                               INDEX compound_key (id,column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT INDEX fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span><span class="cx" style="display: block; padding: 0 10px">                        "
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,8 +691,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 blob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1($this->max_index_length)),
+                               KEY compound_key (id,column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT KEY fulltext_key (column_1),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY key_2 (column_1(10)),
</span><span class="cx" style="display: block; padding: 0 10px">                                KEY key_3 (column_2(100),column_1(10)),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -720,8 +726,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 blob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1 DESC),
-                               KEY compound_key (id,column_1 ASC),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1($this->max_index_length) DESC),
+                               KEY compound_key (id,column_1($this->max_index_length) ASC),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span><span class="cx" style="display: block; padding: 0 10px">                        "
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -744,8 +750,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 blob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1($this->max_index_length)),
+                               KEY compound_key (id,column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span><span class="cx" style="display: block; padding: 0 10px">                        "
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -768,8 +774,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 blob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1        (         column_1),
-                               KEY compound_key (id,      column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1        (         column_1($this->max_index_length)),
+                               KEY compound_key (id,      column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span><span class="cx" style="display: block; padding: 0 10px">                        "
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -792,8 +798,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 blob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                key key_1 (column_1),
-                               key compound_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         key key_1 (column_1($this->max_index_length)),
+                               key compound_key (id,column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span><span class="cx" style="display: block; padding: 0 10px">                        "
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -816,8 +822,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 blob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY KEY_1 (column_1),
-                               KEY compOUND_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY KEY_1 (column_1($this->max_index_length)),
+                               KEY compOUND_key (id,column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT KEY FULLtext_kEY (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span><span class="cx" style="display: block; padding: 0 10px">                        ", false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -839,8 +845,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 blob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1(255)),
-                               KEY compound_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1({$this->max_index_length})),
+                               KEY compound_key (id,column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span><span class="cx" style="display: block; padding: 0 10px">                        ", false );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -862,8 +868,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 blob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1($this->max_index_length)),
+                               KEY compound_key (id,column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 KEY changing_key_length (column_1(20)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -881,8 +887,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 blob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1($this->max_index_length)),
+                               KEY compound_key (id,column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 KEY changing_key_length (column_1(50)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -898,8 +904,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px">                                column_3 blob,
</span><span class="cx" style="display: block; padding: 0 10px">                                PRIMARY KEY  (id),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                KEY key_1 (column_1),
-                               KEY compound_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         KEY key_1 (column_1($this->max_index_length)),
+                               KEY compound_key (id,column_1($this->max_index_length)),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 KEY changing_key_length (column_1(1)),
</span><span class="cx" style="display: block; padding: 0 10px">                                FULLTEXT KEY fulltext_key (column_1)
</span><span class="cx" style="display: block; padding: 0 10px">                        ) ENGINE=MyISAM
</span></span></pre>
</div>
</div>

</body>
</html>