<!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>[25168] trunk: Improve the include / exclude SQL generation in `get_pages()` by using `IN` and `NOT IN` where applicable.</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/25168">25168</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-08-29 18:48:29 +0000 (Thu, 29 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve the include / exclude SQL generation in `get_pages()` by using `IN` and `NOT IN` where applicable. Adds unit tests for include / exclude.
Fixes <a href="http://core.trac.wordpress.org/ticket/22074">#22074</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunktestsphpunittestspostphp">trunk/tests/phpunit/tests/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/post.php (25167 => 25168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/post.php 2013-08-29 18:44:36 UTC (rev 25167)
+++ trunk/src/wp-includes/post.php 2013-08-29 18:48:29 UTC (rev 25168)
</span><span class="lines">@@ -3671,7 +3671,7 @@
</span><span class="cx"> $cache = array();
</span><span class="cx">
</span><span class="cx"> $inclusions = '';
</span><del>- if ( !empty($include) ) {
</del><ins>+ if ( ! empty( $include ) ) {
</ins><span class="cx"> $child_of = 0; //ignore child_of, parent, exclude, meta_key, and meta_value params if using include
</span><span class="cx"> $parent = -1;
</span><span class="cx"> $exclude = '';
</span><span class="lines">@@ -3679,32 +3679,16 @@
</span><span class="cx"> $meta_value = '';
</span><span class="cx"> $hierarchical = false;
</span><span class="cx"> $incpages = wp_parse_id_list( $include );
</span><del>- if ( ! empty( $incpages ) ) {
- foreach ( $incpages as $incpage ) {
- if (empty($inclusions))
- $inclusions = $wpdb->prepare(' AND ( ID = %d ', $incpage);
- else
- $inclusions .= $wpdb->prepare(' OR ID = %d ', $incpage);
- }
- }
</del><ins>+ if ( ! empty( $incpages ) )
+ $inclusions = ' AND ID IN (' . implode( ',', array_map( 'intval', $incpages ) ) . ')';
</ins><span class="cx"> }
</span><del>- if (!empty($inclusions))
- $inclusions .= ')';
</del><span class="cx">
</span><span class="cx"> $exclusions = '';
</span><del>- if ( !empty($exclude) ) {
</del><ins>+ if ( ! empty( $exclude ) ) {
</ins><span class="cx"> $expages = wp_parse_id_list( $exclude );
</span><del>- if ( ! empty( $expages ) ) {
- foreach ( $expages as $expage ) {
- if (empty($exclusions))
- $exclusions = $wpdb->prepare(' AND ( ID <> %d ', $expage);
- else
- $exclusions .= $wpdb->prepare(' AND ID <> %d ', $expage);
- }
- }
</del><ins>+ if ( ! empty( $expages ) )
+ $exclusions = ' AND ID NOT IN (' . implode( ',', array_map( 'intval', $expages ) ) . ')';
</ins><span class="cx"> }
</span><del>- if (!empty($exclusions))
- $exclusions .= ')';
</del><span class="cx">
</span><span class="cx"> $author_query = '';
</span><span class="cx"> if (!empty($authors)) {
</span></span></pre></div>
<a id="trunktestsphpunittestspostphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/post.php (25167 => 25168)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/post.php 2013-08-29 18:44:36 UTC (rev 25167)
+++ trunk/tests/phpunit/tests/post.php 2013-08-29 18:48:29 UTC (rev 25168)
</span><span class="lines">@@ -19,19 +19,19 @@
</span><span class="cx"> wp_set_current_user( $this->old_current_user );
</span><span class="cx"> parent::tearDown();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // helper function: return the timestamp(s) of cron jobs for the specified hook and post
</span><span class="cx"> function _next_schedule_for_post($hook, $id) {
</span><span class="cx"> return wp_next_scheduled('publish_future_post', array(0=>intval($id)));
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // helper function, unsets current user globally
</span><span class="cx"> function _unset_current_user() {
</span><span class="cx"> global $current_user, $user_ID;
</span><del>-
</del><ins>+
</ins><span class="cx"> $current_user = $user_ID = null;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // test simple valid behavior: insert and get a post
</span><span class="cx"> function test_vb_insert_get_delete() {
</span><span class="cx"> register_post_type( 'cpt', array( 'taxonomies' => array( 'post_tag', 'ctax' ) ) );
</span><span class="lines">@@ -707,9 +707,9 @@
</span><span class="cx"> */
</span><span class="cx"> function test_insert_programmatic_sanitized() {
</span><span class="cx"> $this->_unset_current_user();
</span><del>-
</del><ins>+
</ins><span class="cx"> register_taxonomy( 'test_tax', 'post' );
</span><del>-
</del><ins>+
</ins><span class="cx"> $title = rand_str();
</span><span class="cx"> $post_data = array(
</span><span class="cx"> 'post_author' => $this->author_id,
</span><span class="lines">@@ -722,7 +722,7 @@
</span><span class="cx"> );
</span><span class="cx"> $insert_post_id = wp_insert_post( $post_data, true, true );
</span><span class="cx"> $this->assertTrue( ( is_int($insert_post_id) && $insert_post_id > 0 ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $post = get_post( $insert_post_id );
</span><span class="cx"> $this->assertEquals( $post->post_author, $this->author_id );
</span><span class="cx"> $this->assertEquals( $post->post_title, $title );
</span><span class="lines">@@ -733,9 +733,9 @@
</span><span class="cx"> */
</span><span class="cx"> function test_insert_programmatic_without_current_user_success() {
</span><span class="cx"> $this->_unset_current_user();
</span><del>-
</del><ins>+
</ins><span class="cx"> register_taxonomy( 'test_tax', 'post' );
</span><del>-
</del><ins>+
</ins><span class="cx"> $title = rand_str();
</span><span class="cx"> $post_data = array(
</span><span class="cx"> 'post_author' => $this->author_id,
</span><span class="lines">@@ -748,11 +748,11 @@
</span><span class="cx"> );
</span><span class="cx"> // with sanitize set to false
</span><span class="cx"> $insert_post_id = wp_insert_post( $post_data, true, false );
</span><del>-
</del><ins>+
</ins><span class="cx"> $post = get_post( $insert_post_id );
</span><span class="cx"> $this->assertEquals( $post->post_author, $this->author_id );
</span><span class="cx"> $this->assertEquals( $post->post_title, $title );
</span><del>-
</del><ins>+
</ins><span class="cx"> $terms = wp_get_object_terms( $insert_post_id, 'test_tax' );
</span><span class="cx"> $this->assertTrue( ( is_array( $terms ) && count( $terms ) == 3 ) );
</span><span class="cx"> }
</span><span class="lines">@@ -762,9 +762,9 @@
</span><span class="cx"> */
</span><span class="cx"> function test_insert_programmatic_without_current_user_fail() {
</span><span class="cx"> $this->_unset_current_user();
</span><del>-
</del><ins>+
</ins><span class="cx"> register_taxonomy( 'test_tax', 'post' );
</span><del>-
</del><ins>+
</ins><span class="cx"> $title = rand_str();
</span><span class="cx"> $post_data = array(
</span><span class="cx"> // post_author not set
</span><span class="lines">@@ -798,4 +798,29 @@
</span><span class="cx"> _unregister_post_type( $post_type );
</span><span class="cx"> $this->assertEquals( new stdClass, wp_count_posts( $post_type, 'readable' ) );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @ticket 22074
+ */
+ function test_get_pages_include_exclude() {
+ $page_ids = array();
+
+ foreach ( range( 1, 20 ) as $i )
+ $page_ids[] = $this->factory->post->create( array( 'post_type' => 'page' ) );
+
+ $inc = array_slice( $page_ids, 0, 10 );
+ sort( $inc );
+ $exc = array_slice( $page_ids, 10 );
+ sort( $exc );
+
+ $include = get_pages( array( 'include' => $inc ) );
+ $inc_result = wp_list_pluck( $include, 'ID' );
+ sort( $inc_result );
+ $this->assertEquals( $inc, $inc_result );
+
+ $exclude = get_pages( array( 'exclude' => $exc ) );
+ $exc_result = wp_list_pluck( $exclude, 'ID' );
+ sort( $exc_result );
+ $this->assertEquals( $inc, $exc_result );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>