Changeset 38275 for trunk/src/wp-includes/class-wp-tax-query.php

Timestamp:

08/18/2016 06:20:55 PM (10 years ago)

Author:

wonderboymusic

Message:

Query: add a protected field, $db, (composition, as it were) to WP_*_Query classes to hold the value for the database abstraction, instead of importing the global $wpdb into every method that uses it. Reduces the number of global imports by 32.

See #37699.

File:

• trunk/src/wp-includes/class-wp-tax-query.php (modified) (13 diffs)

trunk/src/wp-includes/class-wp-tax-query.php

@@ -93 +93 @@
 
         /**
+         * @since 4.7.0
+         * @access protected
+         * @var wpdb
+         */
+        protected $db;
+
+        /**
          * Constructor.
          *
@@ -120 +127 @@
          */
         public function __construct( $tax_query ) {
+                $this->db = $GLOBALS['wpdb'];
+
                 if ( isset( $tax_query['relation'] ) ) {
                         $this->relation = $this->sanitize_relation( $tax_query['relation'] );
@@ -388 +397 @@
          * @access public
          *
-         * @global wpdb $wpdb The WordPress database abstraction object.
-         *
          * @param array $clause       Query clause, passed by reference.
          * @param array $parent_query Parent query array.
@@ -400 +407 @@
          */
         public function get_sql_for_clause( &$clause, $parent_query ) {
-                global $wpdb;
-
                 $sql = array(
                         'where' => array(),
@@ -433 +438 @@
                         if ( false === $alias ) {
                                 $i = count( $this->table_aliases );
-                                $alias = $i ? 'tt' . $i : $wpdb->term_relationships;
+                                $alias = $i ? 'tt' . $i : $this->db->term_relationships;
 
                                 // Store the alias as part of a flat array to build future iterators.
@@ -441 +446 @@
                                 $clause['alias'] = $alias;
 
-                                $join .= " LEFT JOIN $wpdb->term_relationships";
+                                $join .= " LEFT JOIN {$this->db->term_relationships}";
                                 $join .= $i ? " AS $alias" : '';
                                 $join .= " ON ($this->primary_table.$this->primary_id_column = $alias.object_id)";
@@ -459 +464 @@
                         $where = "$this->primary_table.$this->primary_id_column NOT IN (
                                 SELECT object_id
-                                FROM $wpdb->term_relationships
+                                FROM {$this->db->term_relationships}
                                 WHERE term_taxonomy_id IN ($terms)
                         )";
@@ -475 +480 @@
                         $where = "(
                                 SELECT COUNT(1)
-                                FROM $wpdb->term_relationships
+                                FROM {$this->db->term_relationships}
                                 WHERE term_taxonomy_id IN ($terms)
                                 AND object_id = $this->primary_table.$this->primary_id_column
@@ -482 +487 @@
                 } elseif ( 'NOT EXISTS' === $operator || 'EXISTS' === $operator ) {
 
-                        $where = $wpdb->prepare( "$operator (
+                        $where = $this->db->prepare( "$operator (
                                 SELECT 1
-                                FROM $wpdb->term_relationships
-                                INNER JOIN $wpdb->term_taxonomy
-                                ON $wpdb->term_taxonomy.term_taxonomy_id = $wpdb->term_relationships.term_taxonomy_id
-                                WHERE $wpdb->term_taxonomy.taxonomy = %s
-                                AND $wpdb->term_relationships.object_id = $this->primary_table.$this->primary_id_column
+                                FROM {$this->db->term_relationships}
+                                INNER JOIN {$this->db->term_taxonomy}
+                                ON {$this->db->term_taxonomy}.term_taxonomy_id = {$this->db->term_relationships}.term_taxonomy_id
+                                WHERE {$this->db->term_taxonomy}.taxonomy = %s
+                                AND {$this->db->term_relationships}.object_id = $this->primary_table.$this->primary_id_column
                         )", $clause['taxonomy'] );
 
@@ -598 +603 @@
          * @since 3.2.0
          *
-         * @global wpdb $wpdb The WordPress database abstraction object.
-         *
          * @param array  $query           The single query. Passed by reference.
          * @param string $resulting_field The resulting field. Accepts 'slug', 'name', 'term_taxonomy_id',
@@ -605 +608 @@
          */
         public function transform_query( &$query, $resulting_field ) {
-                global $wpdb;
-
                 if ( empty( $query['terms'] ) )
                         return;
@@ -629 +630 @@
                                 $terms = implode( ",", $query['terms'] );
 
-                                $terms = $wpdb->get_col( "
-                                        SELECT $wpdb->term_taxonomy.$resulting_field
-                                        FROM $wpdb->term_taxonomy
-                                        INNER JOIN $wpdb->terms USING (term_id)
+                                $terms = $this->db->get_col( "
+                                        SELECT {$this->db->term_taxonomy}.$resulting_field
+                                        FROM {$this->db->term_taxonomy}
+                                        INNER JOIN {$this->db->terms} USING (term_id)
                                         WHERE taxonomy = '{$query['taxonomy']}'
-                                        AND $wpdb->terms.{$query['field']} IN ($terms)
+                                        AND {$this->db->terms}.{$query['field']} IN ($terms)
                                 " );
                                 break;
                         case 'term_taxonomy_id':
                                 $terms = implode( ',', array_map( 'intval', $query['terms'] ) );
-                                $terms = $wpdb->get_col( "
+                                $terms = $this->db->get_col( "
                                         SELECT $resulting_field
-                                        FROM $wpdb->term_taxonomy
+                                        FROM {$this->db->term_taxonomy}
                                         WHERE term_taxonomy_id IN ($terms)
                                 " );
@@ -647 +648 @@
                         default:
                                 $terms = implode( ',', array_map( 'intval', $query['terms'] ) );
-                                $terms = $wpdb->get_col( "
+                                $terms = $this->db->get_col( "
                                         SELECT $resulting_field
-                                        FROM $wpdb->term_taxonomy
+                                        FROM {$this->db->term_taxonomy}
                                         WHERE taxonomy = '{$query['taxonomy']}'
                                         AND term_id IN ($terms)