<!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>[27086] trunk/tests/phpunit/includes/testcase.php: Test suite: Trim queries before deciding whether to create temporary tables.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27086">27086</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-02-03 22:39:47 +0000 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Test suite: Trim queries before deciding whether to create temporary tables.
props jdgrimes.
fixes <a href="http://core.trac.wordpress.org/ticket/24800">#24800</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludestestcasephp">trunk/tests/phpunit/includes/testcase.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludestestcasephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/includes/testcase.php (27085 => 27086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/includes/testcase.php 2014-02-03 21:30:25 UTC (rev 27085)
+++ trunk/tests/phpunit/includes/testcase.php 2014-02-03 22:39:47 UTC (rev 27086)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $this->expectedDeprecated();
</span><span class="cx"> $wpdb->query( 'ROLLBACK' );
</span><del>- remove_filter( 'query', array( $this, '_create_temporary_table' ) );
- remove_filter( 'query', array( $this, '_drop_temporary_table' ) );
</del><ins>+ remove_filter( 'query', array( $this, '_create_temporary_tables' ) );
+ remove_filter( 'query', array( $this, '_drop_temporary_tables' ) );
</ins><span class="cx"> remove_filter( 'wp_die_handler', array( $this, 'get_wp_die_handler' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -64,19 +64,19 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $wpdb->query( 'SET autocommit = 0;' );
</span><span class="cx"> $wpdb->query( 'START TRANSACTION;' );
</span><del>- add_filter( 'query', array( $this, '_create_temporary_table' ) );
- add_filter( 'query', array( $this, '_drop_temporary_table' ) );
</del><ins>+ add_filter( 'query', array( $this, '_create_temporary_tables' ) );
+ add_filter( 'query', array( $this, '_drop_temporary_tables' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function _create_temporary_table( $query ) {
- if ( 'CREATE TABLE' === substr( $query, 0, 12 ) )
- return substr_replace( $query, 'CREATE TEMPORARY TABLE', 0, 12 );
</del><ins>+ function _create_temporary_tables( $query ) {
+ if ( 'CREATE TABLE' === substr( trim( $query ), 0, 12 ) )
+ return substr_replace( trim( $query ), 'CREATE TEMPORARY TABLE', 0, 12 );
</ins><span class="cx"> return $query;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function _drop_temporary_table( $query ) {
- if ( 'DROP TABLE' === substr( $query, 0, 10 ) )
- return substr_replace( $query, 'DROP TEMPORARY TABLE', 0, 10 );
</del><ins>+ function _drop_temporary_tables( $query ) {
+ if ( 'DROP TABLE' === substr( trim( $query ), 0, 10 ) )
+ return substr_replace( trim( $query ), 'DROP TEMPORARY TABLE', 0, 10 );
</ins><span class="cx"> return $query;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>