<!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>[32240] branches/3.8: WPDB: When deciding if a query needs extra sanity checking based on collation, return early when we can.</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/32240">32240</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/32240","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>2015-04-21 07:00:52 +0000 (Tue, 21 Apr 2015)</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'>WPDB: When deciding if a query needs extra sanity checking based on collation, return early when we can. Merges <a href="https://core.trac.wordpress.org/changeset/32232">[32232]</a> and <a href="https://core.trac.wordpress.org/changeset/32233">[32233]</a> to the 3.8 branch.
See <a href="https://core.trac.wordpress.org/ticket/32029">#32029</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches38srcwpincludeswpdbphp">branches/3.8/src/wp-includes/wp-db.php</a></li>
<li><a href="#branches38testsphpunittestsdbcharsetphp">branches/3.8/tests/phpunit/tests/db/charset.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches38srcwpincludeswpdbphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.8/src/wp-includes/wp-db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.8/src/wp-includes/wp-db.php 2015-04-21 06:57:58 UTC (rev 32239)
+++ branches/3.8/src/wp-includes/wp-db.php 2015-04-21 07:00:52 UTC (rev 32240)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1958,20 +1958,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->checking_collation ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // We don't need to check the collation for queries that don't read data.
+ $query = ltrim( $query, "\r\n\t (" );
+ if ( preg_match( '/^(?:SHOW|DESCRIBE|DESC|EXPLAIN)\s/i', $query ) ) {
+ return true;
+ }
+
+ // All-ASCII queries don't need extra checking.
+ if ( $this->check_ascii( $query ) ) {
+ return true;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $table = $this->get_table_from_query( $query );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $table ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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->checking_collation = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->get_table_charset( $table );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $collation = $this->get_table_charset( $table );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->checking_collation = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Tables with no collation, or latin1 only, don't need extra checking.
+ if ( false === $collation || 'latin1' === $collation ) {
+ return true;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $table = strtolower( $table );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $this->col_meta[ $table ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">+ // If any of the columns don't have one of these collations, it needs more sanity checking.
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach( $this->col_meta[ $table ] as $col ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $col->Collation ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1999,6 +2017,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * such as 'field' are retained in each value array. If we cannot
</span><span class="cx" style="display: block; padding: 0 10px"> * remove invalid characters, a {@see WP_Error} object is returned.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If any of the columns don't have one of these collations, it needs more sanity checking.
</ins><span class="cx" style="display: block; padding: 0 10px"> protected function strip_invalid_text( $data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Some multibyte character sets that we can check in PHP.
</span><span class="cx" style="display: block; padding: 0 10px"> $mb_charsets = array(
</span></span></pre></div>
<a id="branches38testsphpunittestsdbcharsetphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/3.8/tests/phpunit/tests/db/charset.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/3.8/tests/phpunit/tests/db/charset.php 2015-04-21 06:57:58 UTC (rev 32239)
+++ branches/3.8/tests/phpunit/tests/db/charset.php 2015-04-21 07:00:52 UTC (rev 32240)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,8 +499,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this_table_name = $table_name . '_' . rand_str( 5 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $value[0] = "CREATE TABLE $this_table_name {$value[0]}";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $value[2] = "SELECT * FROM $this_table_name";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value[2] = "SELECT * FROM $this_table_name WHERE a='\xf0\x9f\x98\x88'";
</ins><span class="cx" style="display: block; padding: 0 10px"> $value[3] = "DROP TABLE IF EXISTS $this_table_name";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value[4] = array(
+ "SELECT * FROM $this_table_name WHERE a='foo'",
+ "SHOW FULL TABLES LIKE $this_table_name",
+ "DESCRIBE $this_table_name",
+ "DESC $this_table_name",
+ "EXPLAIN SELECT * FROM $this_table_name",
+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -512,7 +519,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_table_collation_check
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function test_table_collation_check( $create, $expected, $query, $drop ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_table_collation_check( $create, $expected, $query, $drop, $always_true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$_wpdb->query( $drop );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::$_wpdb->query( $create );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -520,6 +527,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $return = self::$_wpdb->check_safe_collation( $query );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $return );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach( $always_true as $true_query ) {
+ $return = self::$_wpdb->check_safe_collation( $true_query );
+ $this->assertTrue( $return );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$_wpdb->query( $drop );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>