Changeset 8738

Timestamp:

08/26/2008 07:18:58 PM (18 years ago)

Author:

ryan

Message:

Use a subquery in categorynot_in query if the DB version supports it. Props pedrop. fixes #7599

Location:

trunk/wp-includes

Files:

• query.php (modified) (1 diff)
• wp-db.php (modified) (1 diff)

trunk/wp-includes/query.php

@@ -1047 +1047 @@
 
                 if ( !empty($q['category__not_in']) ) {
-                        $ids = get_objects_in_term($q['category__not_in'], 'category');
-                        if ( is_wp_error( $ids ) )
-                                return $ids;
-                        if ( is_array($ids) && count($ids > 0) ) {
-                                $out_posts = "'" . implode("', '", $ids) . "'";
-                                $whichcat .= " AND $wpdb->posts.ID NOT IN ($out_posts)";
+                        if ( $wpdb->supports_subqueries() ) {
+                                $cat_string = "'" . implode("', '", $q['category__not_in']) . "'";
+                                $whichcat .= " AND $wpdb->posts.ID NOT IN (SELECT $wpdb->term_relationships.object_id FROM $wpdb->term_relationships WHERE $wpdb->term_relationships.term_taxonomy_id IN ($cat_string) )";
+                        } else {
+                                $ids = get_objects_in_term($q['category__not_in'], 'category');
+                                if ( is_wp_error( $ids ) )
+                                        return $ids;
+                                if ( is_array($ids) && count($ids > 0) ) {
+                                        $out_posts = "'" . implode("', '", $ids) . "'";
+                                        $whichcat .= " AND $wpdb->posts.ID NOT IN ($out_posts)";
+                                }
                         }
                 }

trunk/wp-includes/wp-db.php

@@ -925 +925 @@
 
         /**
+         * Whether of not the database version supports sub-queries.
+         *
+         * @since 2.7
+         *
+         * @return bool True if sub-queries are supported, false if version does not
+         */
+        function supports_subqueries() {
+                return ( version_compare(mysql_get_server_info($this->dbh), '4.1.0', '>=') );
+        }
+
+        /**
          * Retrieve the name of the function that called wpdb.
          *