Changeset 29808

Timestamp:

10/02/2014 01:40:56 AM (10 years ago)

Author:

boonebgorges

Message:

WP_Comment_Query: commentin, commentnot_in, postin, postnot_in.

Props nofearinc, mordauk, boonebgorges

Fixes #25386

Location:

trunk

Files:

• src/wp-includes/comment.php (modified) (4 diffs)
• tests/phpunit/tests/comment/query.php (modified) (1 diff)

trunk/src/wp-includes/comment.php

@@ -258 +258 @@
      *
      * @since 3.1.0
+     * @since 4.1.0 Introduced 'comment__in', 'comment__not_in',
+     *              'post__in', and 'post__not_in' to $query_vars.
      *
      * @param string|array $query_vars
@@ -269 +271 @@
             'fields' => '',
             'ID' => '',
+            'comment__in' => '',
+            'comment__not_in' => '',
             'karma' => '',
             'number' => '',
@@ -277 +281 @@
             'post_ID' => '',
             'post_id' => 0,
+            'post__in' => '',
+            'post__not_in' => '',
             'post_author' => '',
             'post_name' => '',
@@ -409 +415 @@
         }
 
+        // Parse comment IDs for an IN clause.
+        if ( ! empty( $this->query_vars['comment__in'] ) ) {
+            $where .= ' AND comment_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['comment__in'] ) ) . ' )';
+        }
+
+        // Parse comment IDs for a NOT IN clause.
+        if ( ! empty( $this->query_vars['comment__not_in'] ) ) {
+            $where .= ' AND comment_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )';
+        }
+
+        // Parse comment post IDs for an IN clause.
+        if ( ! empty( $this->query_vars['post__in'] ) ) {
+            $where .= ' AND comment_post_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__in'] ) ) . ' )';
+        }
+
+        // Parse comment post IDs for a NOT IN clause.
+        if ( ! empty( $this->query_vars['post__not_in'] ) ) {
+            $where .= ' AND comment_post_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__not_in'] ) ) . ' )';
+        }
+
         if ( '' !== $this->query_vars['author_email'] ) {
             $where .= $wpdb->prepare( ' AND comment_author_email = %s', $this->query_vars['author_email'] );

trunk/tests/phpunit/tests/comment/query.php

@@ -199 +199 @@
         $this->assertEqualSets( array( $comment_1, $comment_2, $comment_3 ), $comment_ids );
     }
+
+    /**
+     * @ticket 29189
+     */
+    function test_fields_comment__in() {
+        $comment_1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+        $comment_2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+        $comment_3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+
+        $comment_ids = get_comments( array(
+            'fields' => 'ids',
+            'comment__in' => array( $comment_1, $comment_3 ),
+        ) );
+
+        $this->assertEqualSets( array( $comment_1, $comment_3 ), $comment_ids );
+    }
+
+    /**
+     * @ticket 29189
+     */
+    function test_fields_comment__not_in() {
+        $comment_1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+        $comment_2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+        $comment_3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+
+        $comment_ids = get_comments( array(
+            'fields' => 'ids',
+            'comment__not_in' => array( $comment_2, $comment_3 ),
+        ) );
+
+        $this->assertEqualSets( array( $comment_1 ), $comment_ids );
+    }
+
+    /**
+     * @ticket 29189
+     */
+    function test_fields_post__in() {
+        $p1 = $this->factory->post->create();
+        $p2 = $this->factory->post->create();
+        $p3 = $this->factory->post->create();
+
+        $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 7, 'comment_approved' => '1' ) );
+        $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
+        $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
+
+        $comment_ids = get_comments( array(
+            'fields' => 'ids',
+            'post__in' => array( $p1, $p2 ),
+        ) );
+
+        $this->assertEqualSets( array( $c1, $c2 ), $comment_ids );
+    }
+
+    /**
+     * @ticket 29189
+     */
+    function test_fields_post__not_in() {
+        $p1 = $this->factory->post->create();
+        $p2 = $this->factory->post->create();
+        $p3 = $this->factory->post->create();
+
+        $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 7, 'comment_approved' => '1' ) );
+        $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
+        $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
+
+        $comment_ids = get_comments( array(
+            'fields' => 'ids',
+            'post__not_in' => array( $p1, $p2 ),
+        ) );
+
+        $this->assertEqualSets( array( $c3 ), $comment_ids );
+    }
 }