Ticket #29189: 29189.2.patch

src/wp-includes/comment.php

@@ -257 +257 @@
          * Execute the query
          *
          * @since 3.1.0
+         * @since 4.1.0 Introduced 'comment_id__in', 'comment_id__not_in',
+         *              'post_id__in', and 'post_id__not_in' to $query_vars.
          *
          * @param string|array $query_vars
          * @return int|array
@@ -268 +270 @@
                         'author_email' => '',
                         'fields' => '',
                         'ID' => '',
+                        'comment_id__in' => '',
+                        'comment_id__not_in' => '',
                         'karma' => '',
                         'number' => '',
                         'offset' => '',
@@ -276 +280 @@
                         'parent' => '',
                         'post_ID' => '',
                         'post_id' => 0,
+                        'post_id__in' => '',
+                        'post_id__not_in' => '',
                         'post_author' => '',
                         'post_name' => '',
                         'post_parent' => '',
@@ -408 +414 @@
                         $where .= $wpdb->prepare( ' AND comment_post_ID = %d', $post_id );
                 }
 
+                // Parse comment IDs for an IN clause.
+                if ( ! empty( $this->query_vars['comment_id__in'] ) ) {
+                        $where .= ' AND comment_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['comment_id__in'] ) ) . ' )';
+                }
+
+                // Parse comment IDs for a NOT IN clause.
+                if ( ! empty( $this->query_vars['comment_id__not_in'] ) ) {
+                        $where .= ' AND comment_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['comment_id__not_in'] ) ) . ' )';
+                }
+
+                // Parse comment post IDs for an IN clause.
+                if ( ! empty( $this->query_vars['post_id__in'] ) ) {
+                        $where .= ' AND comment_post_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_id__in'] ) ) . ' )';
+                }
+
+                // Parse comment post IDs for a NOT IN clause.
+                if ( ! empty( $this->query_vars['post_id__not_in'] ) ) {
+                        $where .= ' AND comment_post_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_id__not_in'] ) ) . ' )';
+                }
+
                 if ( '' !== $this->query_vars['author_email'] ) {
                         $where .= $wpdb->prepare( ' AND comment_author_email = %s', $this->query_vars['author_email'] );
                 }

tests/phpunit/tests/comment/query.php

@@ -198 +198 @@
                 $this->assertCount( 3, $comment_ids );
                 $this->assertEqualSets( array( $comment_1, $comment_2, $comment_3 ), $comment_ids );
         }
+
+        /**
+         * @ticket 29189
+         */
+        function test_fields_comment_id__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_id__in' => array( $comment_1, $comment_3 ),
+                ) );
+
+                $this->assertEqualSets( array( $comment_1, $comment_3 ), $comment_ids );
+        }
+
+        /**
+         * @ticket 29189
+         */
+        function test_fields_comment_id__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_id__not_in' => array( $comment_2, $comment_3 ),
+                ) );
+
+                $this->assertEqualSets( array( $comment_1 ), $comment_ids );
+        }
+
+        /**
+         * @ticket 29189
+         */
+        function test_fields_post_id__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_id__in' => array( $p1, $p2 ),
+                ) );
+
+                $this->assertEqualSets( array( $c1, $c2 ), $comment_ids );
+        }
+
+        /**
+         * @ticket 29189
+         */
+        function test_fields_post_id__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_id__not_in' => array( $p1, $p2 ),
+                ) );
+
+                $this->assertEqualSets( array( $c3 ), $comment_ids );
+        }
 }