Changeset 21472

Timestamp:

08/08/2012 06:24:59 AM (13 years ago)

Author:

nacin

Message:

Lazy-load column info in wpdb. props pento. fixes #20838.

File:

• trunk/wp-includes/wp-db.php (modified) (8 diffs)

trunk/wp-includes/wp-db.php

@@ -135 +135 @@
      *
      * @since 1.2.0
-     * @access private
+     * @access protected
      * @var array
      */
-    var $col_info;
+    protected $col_info;
 
     /**
@@ -514 +514 @@
     function __destruct() {
         return true;
+    }
+
+    /**
+     * PHP5 style magic getter, used to lazy-load expensive data.
+     *
+     * @since 3.5.0
+     *
+     * @param string $var The private member to get, and optionally process
+     * @return mixed The private member
+     */
+    function __get( $var ) {
+        if ( 'col_info' == $var )
+            $this->load_col_info();
+
+        return $this->$var;
     }
 
@@ -903 +918 @@
         $query = str_replace( "'%s'", '%s', $query ); // in case someone mistakenly already singlequoted it
         $query = str_replace( '"%s"', '%s', $query ); // doublequote unquoting
-        $query = str_replace( '%f' , '%F', $query ); // Force floats to be locale unaware       
+        $query = str_replace( '%f' , '%F', $query ); // Force floats to be locale unaware
         $query = preg_replace( '|(?<!%)%s|', "'%s'", $query ); // quote the strings, avoiding escaped strings like %%s
         array_walk( $args, array( &$this, 'escape_by_ref' ) );
@@ -1026 +1041 @@
         $this->col_info    = null;
         $this->last_query  = null;
+        @mysql_free_result( $this->result );
     }
 
@@ -1118 +1134 @@
             $return_val = $this->rows_affected;
         } else {
-            $i = 0;
-            while ( $i < @mysql_num_fields( $this->result ) ) {
-                $this->col_info[$i] = @mysql_fetch_field( $this->result );
-                $i++;
-            }
             $num_rows = 0;
             while ( $row = @mysql_fetch_object( $this->result ) ) {
@@ -1128 +1139 @@
                 $num_rows++;
             }
-
-            @mysql_free_result( $this->result );
 
             // Log number of rows the query returned
@@ -1459 +1468 @@
 
     /**
+     * Load the column metadata from the last query.
+     *
+     * @since 3.5.0
+     *
+     * @access protected
+     */
+    protected function load_col_info() {
+        if ( $this->col_info )
+            return;
+
+        for ( $i = 0; $i < @mysql_num_fields( $this->result ); $i++ ) {
+            $this->col_info[ $i ] = @mysql_fetch_field( $this->result, $i );
+        }
+    }
+
+    /**
      * Retrieve column metadata from the last query.
      *
@@ -1468 +1493 @@
      */
     function get_col_info( $info_type = 'name', $col_offset = -1 ) {
+        $this->load_col_info();
+
         if ( $this->col_info ) {
             if ( $col_offset == -1 ) {