<!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>[36552] trunk/tests/phpunit/tests/dbdelta.php: Tests: Add `Tests_dbDelta::assertTableHasPrimaryKey()`.</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/36552">36552</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/36552","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-17 18:54:27 +0000 (Wed, 17 Feb 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'>Tests: Add `Tests_dbDelta::assertTableHasPrimaryKey()`.
Also fix a typo in the name for the compound key.
Props charlestonsw.
Fixes <a href="https://core.trac.wordpress.org/ticket/34877">#34877</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 2016-02-17 18:00:40 UTC (rev 36551)
+++ trunk/tests/phpunit/tests/dbdelta.php 2016-02-17 18:54:27 UTC (rev 36552)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> KEY key_1 (column_1),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- KEY compoud_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ KEY compound_key (id,column_1),
</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">@@ -105,7 +105,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> KEY key_1 (column_1),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- KEY compoud_key (id,column_1)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ KEY compound_key (id,column_1)
</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">@@ -128,7 +128,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> KEY key_1 (column_1),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- KEY compoud_key (id,column_1)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ KEY compound_key (id,column_1)
</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">@@ -157,7 +157,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> KEY key_1 (column_1),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- KEY compoud_key (id,column_1)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ KEY compound_key (id,column_1)
</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">@@ -171,6 +171,7 @@
</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"> $this->assertTableHasColumn( 'column_1', $wpdb->prefix . 'dbdelta_test' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTableHasPrimaryKey( 'id' , $wpdb->prefix . 'dbdelta_test' );
</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">@@ -189,7 +190,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"> PRIMARY KEY (id),
</span><span class="cx" style="display: block; padding: 0 10px"> KEY key_1 (column_1),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- KEY compoud_key (id,column_1)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ KEY compound_key (id,column_1)
</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">@@ -215,7 +216,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> KEY key_1 (column_1),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- KEY compoud_key (id,column_1)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ KEY compound_key (id,column_1)
</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">@@ -265,7 +266,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> KEY key_1 (column_1),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- KEY compoud_key (id,column_1),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ KEY compound_key (id,column_1),
</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">@@ -286,7 +287,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $table The database table name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function assertTableRowHasValue( $column, $value, $table ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $table_row = $wpdb->get_row( "select $column from {$table} where $column = '$value'" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,7 +305,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $table The database table name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function assertTableHasColumn( $column, $table ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $table_fields = $wpdb->get_results( "DESCRIBE {$table}" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,6 +313,22 @@
</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">+ * Assert that a table has a primary key.
+ *
+ * Checks for single-column primary keys. May not work for multi-column primary keys.
+ *
+ * @param string $column The column for the primary key.
+ * @param string $table The database table name.
+ */
+ protected function assertTableHasPrimaryKey( $column , $table ) {
+ global $wpdb;
+
+ $table_indices = $wpdb->get_results( "SHOW INDEX FROM {$table}" );
+
+ $this->assertCount( 1, wp_list_filter( $table_indices, array( 'Key_name' => 'PRIMARY' , 'Column_name' => $column ) , 'AND' ) );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Assert that a table doesn't have a column.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $column The field name.
</span></span></pre>
</div>
</div>
</body>
</html>