<!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>[33994] branches/4.0: WPDB: `get_table_from_query()` didn't find table names with hyphens in them.</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/33994">33994</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/33994","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-09-10 07:04:04 +0000 (Thu, 10 Sep 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: `get_table_from_query()` didn't find table names with hyphens in them.
Merge of <a href="https://core.trac.wordpress.org/changeset/33718">[33718]</a> to the 4.0 branch.
Props dustinbolton, pento.
See <a href="https://core.trac.wordpress.org/ticket/33470">#33470</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches40srcwpincludeswpdbphp">branches/4.0/src/wp-includes/wp-db.php</a></li>
<li><a href="#branches40testsphpunittestsdbphp">branches/4.0/tests/phpunit/tests/db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches40srcwpincludeswpdbphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/src/wp-includes/wp-db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/src/wp-includes/wp-db.php 2015-09-10 06:59:54 UTC (rev 33993)
+++ branches/4.0/src/wp-includes/wp-db.php 2015-09-10 07:04:04 UTC (rev 33994)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2821,7 +2821,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> . '|REPLACE(?:\s+LOW_PRIORITY|\s+DELAYED)?(?:\s+INTO)?'
</span><span class="cx" style="display: block; padding: 0 10px"> . '|UPDATE(?:\s+LOW_PRIORITY)?(?:\s+IGNORE)?'
</span><span class="cx" style="display: block; padding: 0 10px"> . '|DELETE(?:\s+LOW_PRIORITY|\s+QUICK|\s+IGNORE)*(?:\s+FROM)?'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- . ')\s+((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ . ')\s+((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return str_replace( '`', '', $maybe[1] );
</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">@@ -2829,7 +2829,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/^\s*(?:'
</span><span class="cx" style="display: block; padding: 0 10px"> . 'SHOW\s+TABLE\s+STATUS.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)'
</span><span class="cx" style="display: block; padding: 0 10px"> . '|SHOW\s+(?:FULL\s+)?TABLES.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- . ')\W((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)\W/is', $query, $maybe ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ . ')\W((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\W/is', $query, $maybe ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return str_replace( '`', '', $maybe[1] );
</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">@@ -2848,7 +2848,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> . '|LOAD\s+DATA.*INFILE.*INTO\s+TABLE'
</span><span class="cx" style="display: block; padding: 0 10px"> . '|(?:GRANT|REVOKE).*ON\s+TABLE'
</span><span class="cx" style="display: block; padding: 0 10px"> . '|SHOW\s+(?:.*FROM|.*TABLE)'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- . ')\s+\(*\s*((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', $query, $maybe ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ . ')\s+\(*\s*((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', $query, $maybe ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return str_replace( '`', '', $maybe[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches40testsphpunittestsdbphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.0/tests/phpunit/tests/db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.0/tests/phpunit/tests/db.php 2015-09-10 06:59:54 UTC (rev 33993)
+++ branches/4.0/tests/phpunit/tests/db.php 2015-09-10 07:04:04 UTC (rev 33994)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -491,7 +491,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function data_get_table_from_query() {
</span><span class="cx" style="display: block; padding: 0 10px"> $table = 'a_test_table_name';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $db_table = '`a_test_db`.`another_test_table`';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $more_tables = array(
+ // table_name => expected_value
+ '`a_test_db`.`another_test_table`' => 'a_test_db.another_test_table',
+ 'a-test-with-dashes' => 'a-test-with-dashes',
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $queries = array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Basic
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,11 +600,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $querycount = count( $queries );
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $ii = 0; $ii < $querycount; $ii++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $db_query = str_replace( $table, $db_table, $queries[ $ii ] );
- $expected_db_table = str_replace( '`', '', $db_table );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $more_tables as $name => $expected_name ) {
+ $new_query = str_replace( $table, $name, $queries[ $ii ] );
+ $queries[] = array( $new_query, $expected_name );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $queries[ $ii ] = array( $queries[ $ii ], $table );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $queries[] = array( $db_query, $expected_db_table );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $queries;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>