Ticket #18081: transform_array_to_sql_condition.diff

Index: wp-includes/taxonomy.php
===================================================================
--- wp-includes/taxonomy.php    (revision 17409)
+++ wp-includes/taxonomy.php    (working copy)
@@ -%ld,%ld +%ld,%ld @@
 
        $order = ( 'desc' == strtolower( $order ) ) ? 'DESC' : 'ASC';
 
-       $term_ids = array_map('intval', $term_ids );
+       $taxonomies_add = transform_array_to_sql_condition( $taxonomies );
+       $term_ids_add = transform_array_to_sql_condition( $term_ids, true );
 
-       $taxonomies = "'" . implode( "', '", $taxonomies ) . "'";
-       $term_ids = "'" . implode( "', '", $term_ids ) . "'";
+       $object_ids = $wpdb->get_col("SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy $taxonomies_add AND tt.term_id $term_ids_add ORDER BY tr.object_id $order");
 
-       $object_ids = $wpdb->get_col("SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tt.term_id IN ($term_ids) ORDER BY tr.object_id $order");
-
        if ( ! $object_ids )
                return array();
 
@@ -%ld,%ld +%ld,%ld @@
                                if ( empty( $terms ) )
                                        continue;
 
-                               $terms = implode( ',', $terms );
-
+                               $terms_add = transform_array_to_sql_condition( $terms, true );
+                               
                                $where[] = "$primary_table.$primary_id_column NOT IN (
                                        SELECT object_id
                                        FROM $wpdb->term_relationships
-                                       WHERE term_taxonomy_id IN ($terms)
+                                       WHERE term_taxonomy_id $terms_add
                                )";
                        } elseif ( 'AND' == $operator ) {
 
@@ -%ld,%ld +%ld,%ld @@
 
                                $num_terms = count( $terms );
 
-                               $terms = implode( ',', $terms );
+                               $terms_add = transform_array_to_sql_condition( $terms, true );
 
                                $where[] = "$primary_table.$primary_id_column IN (
                                        SELECT object_id
                                        FROM $wpdb->term_relationships
-                                       WHERE term_taxonomy_id IN ($terms)
+                                       WHERE term_taxonomy_id $terms_add
                                        GROUP BY object_id HAVING COUNT(object_id) = $num_terms
                                )";
                        }
@@ -%ld,%ld +%ld,%ld @@
                switch ( $field ) {
                        case 'slug':
                        case 'name':
-                               $terms = "'" . implode( "','", array_map( 'sanitize_title_for_query', $terms ) ) . "'";
+                               $terms_add = transform_array_to_sql_condition( $terms, false, 'sanitize_title_for_query' );
                                $terms = $wpdb->get_col( "
                                        SELECT $wpdb->term_taxonomy.$resulting_field
                                        FROM $wpdb->term_taxonomy
                                        INNER JOIN $wpdb->terms USING (term_id)
                                        WHERE taxonomy = '$taxonomy'
-                                       AND $wpdb->terms.$field IN ($terms)
+                                       AND $wpdb->terms.$field $terms_add
                                " );
                                break;
 
                        default:
-                               $terms = implode( ',', array_map( 'intval', $terms ) );
+                               $terms_add = transform_array_to_sql_condition( $terms, true );
                                $terms = $wpdb->get_col( "
                                        SELECT $resulting_field
                                        FROM $wpdb->term_taxonomy
                                        WHERE taxonomy = '$taxonomy'
-                                       AND term_id IN ($terms)
+                                       AND term_id $terms_add
                                " );
                }
        }
@@ -%ld,%ld +%ld,%ld @@
        else
                $order = '';
 
-       $where = "tt.taxonomy IN ('" . implode("', '", $taxonomies) . "')";
+       $taxonomies_add = transform_array_to_sql_condition( $taxonomies );
+
+       $where = "tt.taxonomy $taxonomies_add";
        $inclusions = '';
        if ( !empty($include) ) {
                $exclude = '';
@@ -%ld,%ld +%ld,%ld @@
 
        foreach ( (array) $taxonomies as $taxonomy ) {
                $tt_ids = wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids'));
-               $in_tt_ids = "'" . implode("', '", $tt_ids) . "'";
+               $in_tt_ids = transform_array_to_sql_condition( $tt_ids, true );
+
                do_action( 'delete_term_relationships', $object_id, $tt_ids );
-               $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_tt_ids)", $object_id) );
+               $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id $in_tt_ids", $object_id) );
                do_action( 'deleted_term_relationships', $object_id, $tt_ids );
                wp_update_term_count($tt_ids, $taxonomy);
        }
@@ -%ld,%ld +%ld,%ld @@
        if ( !empty($orderby) )
                $orderby = "ORDER BY $orderby";
 
-       $taxonomies = "'" . implode("', '", $taxonomies) . "'";
-       $object_ids = implode(', ', $object_ids);
-
+       $taxonomies_add = transform_array_to_sql_condition( $taxonomies );
+       $object_ids_add = transform_array_to_sql_condition( $object_ids, true );
+       $object_ids = implode( ", ", $object_ids ); // left for compatibility reasons. it's used in filter below
+       
        $select_this = '';
        if ( 'all' == $fields )
                $select_this = 't.*, tt.*';
@@ -%ld,%ld +%ld,%ld @@
        else if ( 'all_with_object_id' == $fields )
                $select_this = 't.*, tt.*, tr.object_id';
 
-       $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id INNER JOIN $wpdb->term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tr.object_id IN ($object_ids) $orderby $order";
+       $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id INNER JOIN $wpdb->term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy $taxonomies_add AND tr.object_id $object_ids_add $orderby $order";
 
        if ( 'all' == $fields || 'all_with_object_id' == $fields ) {
                $terms = array_merge($terms, $wpdb->get_results($query));
@@ -%ld,%ld +%ld,%ld @@
        } else if ( 'ids' == $fields || 'names' == $fields ) {
                $terms = array_merge($terms, $wpdb->get_col($query));
        } else if ( 'tt_ids' == $fields ) {
-               $terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($object_ids) AND tt.taxonomy IN ($taxonomies) $orderby $order");
+               $terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id $object_ids_add AND tt.taxonomy $taxonomies_add $orderby $order");
        }
 
        if ( ! $terms )
@@ -%ld,%ld +%ld,%ld @@
        if ( ! $append ) {
                $delete_terms = array_diff($old_tt_ids, $tt_ids);
                if ( $delete_terms ) {
-                       $in_delete_terms = "'" . implode("', '", $delete_terms) . "'";
+                       $in_delete_terms = transform_array_to_sql_condition( $delete_terms, true );
                        do_action( 'delete_term_relationships', $object_id, $delete_terms );
-                       $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_delete_terms)", $object_id) );
+                       $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id $in_delete_terms", $object_id) );
                        do_action( 'deleted_term_relationships', $object_id, $delete_terms );
                        wp_update_term_count($delete_terms, $taxonomy);
                }
@@ -%ld,%ld +%ld,%ld @@
        $taxonomies = array();
        // If no taxonomy, assume tt_ids.
        if ( empty($taxonomy) ) {
-               $tt_ids = array_map('intval', $ids);
-               $tt_ids = implode(', ', $tt_ids);
-               $terms = $wpdb->get_results("SELECT term_id, taxonomy FROM $wpdb->term_taxonomy WHERE term_taxonomy_id IN ($tt_ids)");
+               $tt_ids = transform_array_to_sql_condition( $tt_ids, true );
+               $terms = $wpdb->get_results("SELECT term_id, taxonomy FROM $wpdb->term_taxonomy WHERE term_taxonomy_id $tt_ids");
                $ids = array();
                foreach ( (array) $terms as $term ) {
                        $taxonomies[] = $term->taxonomy;
@@ -%ld,%ld +%ld,%ld @@
        // Get the object and term ids and stick them in a lookup table
        $tax_obj = get_taxonomy($taxonomy);
        $object_types = esc_sql($tax_obj->object_type);
-       $results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (" . implode(',', array_keys($term_ids)) . ") AND post_type IN ('" . implode("', '", $object_types) . "') AND post_status = 'publish'");
+       $term_ids_in = transform_array_to_sql_condition( array_keys( $term_ids ), true );
+       
+       $results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id $term_ids_in AND post_type IN ('" . implode("', '", $object_types) . "') AND post_status = 'publish'");
        foreach ( $results as $row ) {
                $id = $term_ids[$row->term_taxonomy_id];
                $term_items[$id][$row->object_id] = isset($term_items[$id][$row->object_id]) ? ++$term_items[$id][$row->object_id] : 1;
@@ -%ld,%ld +%ld,%ld @@
 
        return $parent;
 }
+
+/**
+ * Given an array of values this function will return a string to be put in
+ * a sql query based on the amount of values. for multiple values it will return "IN ('val1', 'val2'..)"
+ * while for single values it will return "= 'val1'" in order to avoid the creation of temporary 
+ * tables and improve performance
+ *
+ * @param array $values
+ * @param bool $treat_as_integer would make sure to skip "'" escaping and cast all values as integers
+ * @param mixed $array_map_sanitation a function name or callback to be used to sanitize $values via array_map() before usage
+ * @return string
+ */
+function transform_array_to_sql_condition( $values, $treat_as_integer = false, $array_map_sanitation = NULL ) {
+       $values = (array) $values;
+       if ( !is_null( $array_map_sanitation ) )
+               $values = array_map( $array_map_sanitation, $values );
+               
+       if ( true === $treat_as_integer ) {
+               $glue = ", ";
+               $pre_glue = $post_glue = "";
+               $values = array_map( 'intval', $values );
+       } else {
+               $glue = "',' ";
+               $pre_glue = $post_glue = "'";
+       }
+       if ( count( $values ) > 1 ) {
+               $vals = $pre_glue . implode( $glue, $values ) . $post_glue;
+               $vals_sql_add = "IN ($vals)";
+       } else {
+               $vals_sql_add = "= '" . array_shift( $values ) . "'"; 
+       }
+       return $vals_sql_add;
+}
\ No newline at end of file