<!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>[54540] branches/6.0/tests/phpunit/tests: Query: Validate relation in `WP_Date_Query`.</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 { white-space: pre-line; 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/54540">54540</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/54540","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-10-17 12:36:06 +0000 (Mon, 17 Oct 2022)</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'>Query: Validate relation in `WP_Date_Query`.
Props dd32, johnjamesjacoby, martinkrcho, ehtis, paulkevan, peterwilsoncc.
Merges <a href="https://core.trac.wordpress.org/changeset/54530">[54530]</a> to the 6.0 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches60srcwpincludesclasswpdatequeryphp">branches/6.0/src/wp-includes/class-wp-date-query.php</a></li>
<li><a href="#branches60testsphpunittestsdatequeryphp">branches/6.0/tests/phpunit/tests/date/query.php</a></li>
<li><a href="#branches60testsphpunitteststermtaxQueryphp">branches/6.0/tests/phpunit/tests/term/taxQuery.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches60">branches/6.0/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.0
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/6.0 2022-10-17 12:34:37 UTC (rev 54539)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.0 2022-10-17 12:36:06 UTC (rev 54540)
</ins><a id="branches60"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.0</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:53349,53352-53354,53358,53360,53362,53366,53368,53370,53372-53373,53375,53377-53378,53382-53383,53388,53402-53404,53409,53413,53416,53418-53421,53430,53437,53439,53442,53447-53448,53496,53540,53568,53581-53582,53588-53589,53592-53593,53631,53644,53646,53657,53659,53663,53665,53692,53704,53718,53725,53737,53793,53924,53927,53929,53958-53960,54217,54322,54521-54529
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:53349,53352-53354,53358,53360,53362,53366,53368,53370,53372-53373,53375,53377-53378,53382-53383,53388,53402-53404,53409,53413,53416,53418-53421,53430,53437,53439,53442,53447-53448,53496,53540,53568,53581-53582,53588-53589,53592-53593,53631,53644,53646,53657,53659,53663,53665,53692,53704,53718,53725,53737,53793,53924,53927,53929,53958-53960,54217,54322,54521-54530
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches60srcwpincludesclasswpdatequeryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/src/wp-includes/class-wp-date-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/src/wp-includes/class-wp-date-query.php 2022-10-17 12:34:37 UTC (rev 54539)
+++ branches/6.0/src/wp-includes/class-wp-date-query.php 2022-10-17 12:36:06 UTC (rev 54540)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,8 +149,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
- $this->relation = 'OR';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $date_query['relation'] ) ) {
+ $this->relation = $this->sanitize_relation( $date_query['relation'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->relation = 'AND';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,6 +219,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->validate_date_values( $queries );
</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">+ // Sanitize the relation parameter.
+ $queries['relation'] = $this->sanitize_relation( $queries['relation'] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $queries as $key => $q ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $q ) || in_array( $key, $this->time_keys, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // This is a first-order query. Trust the values and sanitize when building SQL.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1040,4 +1043,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Sanitizes a 'relation' operator.
+ *
+ * @since 6.0.3
+ *
+ * @param string $relation Raw relation key from the query argument.
+ * @return string Sanitized relation ('AND' or 'OR').
+ */
+ public function sanitize_relation( $relation ) {
+ if ( 'OR' === strtoupper( $relation ) ) {
+ return 'OR';
+ } else {
+ return 'AND';
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches60testsphpunittestsdatequeryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/tests/phpunit/tests/date/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/tests/phpunit/tests/date/query.php 2022-10-17 12:34:37 UTC (rev 54539)
+++ branches/6.0/tests/phpunit/tests/date/query.php 2022-10-17 12:36:06 UTC (rev 54540)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1135,4 +1135,142 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // MySQL ignores the invalid clause.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( $p1, $p2 ), $q->posts );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @covers WP_Date_Query::get_sql
+ */
+ public function test_relation_in_query_and() {
+ $date_query = array(
+ 'relation' => 'AND',
+ array(
+ 'before' => array(
+ 'year' => 2021,
+ 'month' => 9,
+ 'day' => 20,
+ ),
+ 'after' => array(
+ 'year' => 2019,
+ 'month' => 2,
+ 'day' => 25,
+ ),
+ 'inclusive' => true,
+ ),
+ array(
+ 'before' => array(
+ 'year' => 2016,
+ 'month' => 9,
+ 'day' => 11,
+ ),
+ 'after' => array(
+ 'year' => 2014,
+ 'month' => 5,
+ 'day' => 12,
+ ),
+ 'inclusive' => false,
+ ),
+ );
+
+ $q = new WP_Date_Query( $date_query );
+
+ $sql = $q->get_sql();
+
+ $parts = mb_split( '\)\s+AND\s+\(', $sql );
+ $this->assertIsArray( $parts, 'SQL query cannot be split into multiple parts using operator AND.' );
+ $this->assertEquals( 2, count( $parts ), 'SQL query does not contain correct number of AND operators.' );
+
+ $this->assertStringNotContainsString( 'OR', $sql, 'SQL query contains conditions joined by operator OR.' );
+ }
+
+ /**
+ * @covers WP_Date_Query::get_sql
+ */
+ public function test_relation_in_query_or() {
+ $date_query = array(
+ 'relation' => 'OR',
+ array(
+ 'before' => array(
+ 'year' => 2021,
+ 'month' => 9,
+ 'day' => 20,
+ ),
+ 'after' => array(
+ 'year' => 2019,
+ 'month' => 2,
+ 'day' => 25,
+ ),
+ 'inclusive' => true,
+ ),
+ array(
+ 'before' => array(
+ 'year' => 2016,
+ 'month' => 9,
+ 'day' => 11,
+ ),
+ 'after' => array(
+ 'year' => 2014,
+ 'month' => 5,
+ 'day' => 12,
+ ),
+ 'inclusive' => false,
+ ),
+ );
+
+ $q = new WP_Date_Query( $date_query );
+
+ $sql = $q->get_sql();
+
+ $this->assertStringContainsString( 'OR', $sql, 'SQL query does not contain conditions joined by operator OR.' );
+
+ $parts = mb_split( '\)\s+OR\s+\(', $sql );
+ $this->assertIsArray( $parts, 'SQL query cannot be split into multiple parts using operator OR.' );
+ $this->assertEquals( 2, count( $parts ), 'SQL query does not contain correct number of OR operators.' );
+
+ // Checking number of occurrences of AND while skipping the one at the beginning.
+ $this->assertSame( 2, substr_count( substr( $sql, 5 ), 'AND' ), 'SQL query does not contain expected number conditions joined by operator AND.' );
+ }
+
+ /**
+ * @covers WP_Date_Query::get_sql
+ */
+ public function test_relation_in_query_unsupported() {
+ $date_query = array(
+ 'relation' => 'UNSUPPORTED',
+ array(
+ 'before' => array(
+ 'year' => 2021,
+ 'month' => 9,
+ 'day' => 20,
+ ),
+ 'after' => array(
+ 'year' => 2019,
+ 'month' => 2,
+ 'day' => 25,
+ ),
+ 'inclusive' => true,
+ ),
+ array(
+ 'before' => array(
+ 'year' => 2016,
+ 'month' => 9,
+ 'day' => 11,
+ ),
+ 'after' => array(
+ 'year' => 2014,
+ 'month' => 5,
+ 'day' => 12,
+ ),
+ 'inclusive' => false,
+ ),
+ );
+
+ $q = new WP_Date_Query( $date_query );
+
+ $sql = $q->get_sql();
+
+ $parts = mb_split( '\)\s+AND\s+\(', $sql );
+ $this->assertIsArray( $parts, 'SQL query cannot be split into multiple parts using operator AND.' );
+ $this->assertEquals( 2, count( $parts ), 'SQL query does not contain correct number of AND operators.' );
+
+ $this->assertStringNotContainsString( 'OR', $sql, 'SQL query contains conditions joined by operator OR.' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches60testsphpunitteststermtaxQueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.0/tests/phpunit/tests/term/taxQuery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.0/tests/phpunit/tests/term/taxQuery.php 2022-10-17 12:34:37 UTC (rev 54539)
+++ branches/6.0/tests/phpunit/tests/term/taxQuery.php 2022-10-17 12:36:06 UTC (rev 54540)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,6 +335,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"> * @ticket 18105
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @covers WP_Tax_Query::get_sql
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sql_relation_and_operator_in() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,11 +382,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 3, substr_count( $sql['join'], 'JOIN' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Checking number of occurrences of AND while skipping the one at the beginning.
+ $this->assertSame( 2, substr_count( substr( $sql['where'], 5 ), 'AND' ), 'SQL query does not contain expected number conditions joined by operator AND.' );
+
+ $this->assertStringNotContainsString( 'OR', $sql['where'], 'SQL query contains conditions joined by operator OR.' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> _unregister_taxonomy( 'wptests_tax' );
</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><span class="cx" style="display: block; padding: 0 10px"> * @ticket 18105
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @covers WP_Tax_Query::get_sql
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_sql_nested_relation_or_operator_in() {
</span><span class="cx" style="display: block; padding: 0 10px"> register_taxonomy( 'wptests_tax', 'post' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -434,6 +441,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sql = $tq->get_sql( $wpdb->posts, 'ID' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 2, substr_count( $sql['join'], 'JOIN' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 2, substr_count( $sql['where'], 'OR' ), 'SQL query does not contain expected number conditions joined by operator OR.' );
+ $this->assertStringNotContainsString( 'AND', substr( $sql['where'], 5 ), 'SQL query contains conditions joined by operator AND.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_taxonomy( 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,4 +504,60 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _unregister_taxonomy( 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 18105
+ * @covers WP_Tax_Query::get_sql
+ */
+ public function test_get_sql_relation_unsupported() {
+ register_taxonomy( 'wptests_tax', 'post' );
+
+ $t1 = self::factory()->term->create(
+ array(
+ 'taxonomy' => 'wptests_tax',
+ )
+ );
+ $t2 = self::factory()->term->create(
+ array(
+ 'taxonomy' => 'wptests_tax',
+ )
+ );
+ $t3 = self::factory()->term->create(
+ array(
+ 'taxonomy' => 'wptests_tax',
+ )
+ );
+
+ $tq = new WP_Tax_Query(
+ array(
+ 'relation' => 'UNSUPPORTED',
+ array(
+ 'taxonomy' => 'wptests_tax',
+ 'field' => 'term_id',
+ 'terms' => $t1,
+ ),
+ array(
+ 'taxonomy' => 'wptests_tax',
+ 'field' => 'term_id',
+ 'terms' => $t2,
+ ),
+ array(
+ 'taxonomy' => 'wptests_tax',
+ 'field' => 'term_id',
+ 'terms' => $t3,
+ ),
+ )
+ );
+
+ global $wpdb;
+ $sql = $tq->get_sql( $wpdb->posts, 'ID' );
+
+ // Checking number of occurrences of AND while skipping the one at the beginning.
+ $this->assertSame( 2, substr_count( substr( $sql['where'], 5 ), 'AND' ), 'SQL query does not contain expected number conditions joined by operator AND.' );
+
+ $this->assertStringNotContainsString( 'UNSUPPORTED', $sql['where'], 'SQL query contains unsupported relation operator.' );
+ $this->assertStringNotContainsString( 'OR', $sql['where'], 'SQL query contains conditions joined by operator OR.' );
+
+ _unregister_taxonomy( 'wptests_tax' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>