Changes from branches/3.0/wp-includes/wp-db.php at r15470 to trunk/wp-includes/wp-db.php at r17079

File:

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

trunk/wp-includes/wp-db.php

@@ -49 +49 @@
  * @subpackage Database
  * @since 0.71
- * @final
  */
 class wpdb {
@@ -66 +65 @@
      *
      * @access private
-     * @since 2.5
+     * @since 2.5.0
      * @var bool
      */
@@ -75 +74 @@
      *
      * @see get_last_error()
-     * @since 2.5
+     * @since 2.5.0
      * @access private
      * @var string
@@ -93 +92 @@
      * Count of rows returned by previous query
      *
-     * @since 1.2
+     * @since 1.2.0
      * @access private
      * @var int
@@ -457 +456 @@
      * A textual description of the last query/get_row/get_var call
      *
-     * @since unknown
+     * @since 3.0.0
      * @access public
      * @var string
@@ -477 +476 @@
      */
     function wpdb( $dbuser, $dbpassword, $dbname, $dbhost ) {
-        if( defined( 'WP_USE_MULTIPLE_DB' ) && WP_USE_MULTIPLE_DB )
-            $this->db_connect();
         return $this->__construct( $dbuser, $dbpassword, $dbname, $dbhost );
     }
@@ -503 +500 @@
             $this->show_errors();
 
-        if ( is_multisite() ) {
+        $this->init_charset();
+
+        $this->dbuser = $dbuser;
+        $this->dbpassword = $dbpassword;
+        $this->dbname = $dbname;
+        $this->dbhost = $dbhost;
+
+        $this->db_connect();
+    }
+
+    /**
+     * PHP5 style destructor and will run when database object is destroyed.
+     *
+     * @see wpdb::__construct()
+     * @since 2.0.8
+     * @return bool true
+     */
+    function __destruct() {
+        return true;
+    }
+
+    /**
+     * Set $this->charset and $this->collate
+     *
+     * @since 3.1.0
+     */
+    function init_charset() {
+        if ( function_exists('is_multisite') && is_multisite() ) {
             $this->charset = 'utf8';
             if ( defined( 'DB_COLLATE' ) && DB_COLLATE )
@@ -515 +539 @@
         if ( defined( 'DB_CHARSET' ) )
             $this->charset = DB_CHARSET;
-
-        $this->dbuser = $dbuser;
-
-        $this->dbh = @mysql_connect( $dbhost, $dbuser, $dbpassword, true );
-        if ( !$this->dbh ) {
-            $this->bail( sprintf( /*WP_I18N_DB_CONN_ERROR*/"
-<h1>Error establishing a database connection</h1>
-<p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>%s</code>. This could mean your host's database server is down.</p>
-<ul>
-    <li>Are you sure you have the correct username and password?</li>
-    <li>Are you sure that you have typed the correct hostname?</li>
-    <li>Are you sure that the database server is running?</li>
-</ul>
-<p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>
-"/*/WP_I18N_DB_CONN_ERROR*/, $dbhost ), 'db_connect_fail' );
-            return;
-        }
-
-        $this->ready = true;
-
-        if ( $this->has_cap( 'collation' ) && !empty( $this->charset ) ) {
-            if ( function_exists( 'mysql_set_charset' ) ) {
-                mysql_set_charset( $this->charset, $this->dbh );
+    }
+
+    /**
+     * Sets the connection's character set.
+     *
+     * @since 3.1.0
+     *
+     * @param resource $dbh     The resource given by mysql_connect
+     * @param string   $charset The character set (optional)
+     * @param string   $collate The collation (optional)
+     */
+    function set_charset($dbh, $charset = null, $collate = null) {
+        if ( !isset($charset) )
+            $charset = $this->charset;
+        if ( !isset($collate) )
+            $collate = $this->collate;
+        if ( $this->has_cap( 'collation', $dbh ) && !empty( $charset ) ) {
+            if ( function_exists( 'mysql_set_charset' ) && $this->has_cap( 'set_charset', $dbh ) ) {
+                mysql_set_charset( $charset, $dbh );
                 $this->real_escape = true;
             } else {
-                $query = $this->prepare( 'SET NAMES %s', $this->charset );
-                if ( ! empty( $this->collate ) )
-                    $query .= $this->prepare( ' COLLATE %s', $this->collate );
-                $this->query( $query );
+                $query = $this->prepare( 'SET NAMES %s', $charset );
+                if ( ! empty( $collate ) )
+                    $query .= $this->prepare( ' COLLATE %s', $collate );
+                mysql_query( $query, $dbh );
             }
         }
-
-        $this->select( $dbname, $this->dbh );
-    }
-
-    /**
-     * PHP5 style destructor and will run when database object is destroyed.
-     *
-     * @see wpdb::__construct()
-     * @since 2.0.8
-     * @return bool true
-     */
-    function __destruct() {
-        return true;
     }
 
@@ -738 +745 @@
      */
     function select( $db, $dbh = null) {
-        if ( is_null($dbh) ) 
+        if ( is_null($dbh) )
             $dbh = $this->dbh;
 
         if ( !@mysql_select_db( $db, $dbh ) ) {
             $this->ready = false;
-            $this->bail( sprintf( /*WP_I18N_DB_SELECT_DB*/'
-<h1>Can&#8217;t select database</h1>
+            $this->bail( sprintf( /*WP_I18N_DB_SELECT_DB*/'<h1>Can&#8217;t select database</h1>
 <p>We were able to connect to the database server (which means your username and password is okay) but not able to select the <code>%1$s</code> database.</p>
 <ul>
@@ -775 +781 @@
      * @see mysql_real_escape_string()
      * @see addslashes()
-     * @since 2.8
+     * @since 2.8.0
      * @access private
      *
@@ -791 +797 @@
      * Escape data. Works on arrays.
      *
-     * @uses wpdb::_escape()
-     * @uses wpdb::_real_escape()
-     * @since  2.8
+     * @uses wpdb::_escape()
+     * @uses wpdb::_real_escape()
+     * @since  2.8.0
      * @access private
      *
@@ -996 +1002 @@
      * call to this function they can be enabled.
      *
-     * @since 2.5
+     * @since 2.5.0
      * @see wpdb::hide_errors()
      * @param bool $suppress Optional. New value. Defaults to true.
@@ -1019 +1025 @@
     }
 
-    function db_connect( $query = "SELECT" ) {
+    /**
+     * Connect to and select database
+     *
+     * @since 3.0.0
+     */
+    function db_connect() {
         global $db_list, $global_db_list;
-        if ( ! is_array( $db_list ) )
-            return true;
-
-        if ( $this->blogs != '' && preg_match("/(" . $this->blogs . "|" . $this->users . "|" . $this->usermeta . "|" . $this->site . "|" . $this->sitemeta . "|" . $this->sitecategories . ")/i",$query) ) {
-            $action = 'global';
-            $details = $global_db_list[ mt_rand( 0, count( $global_db_list ) -1 ) ];
-            $this->db_global = $details;
-        } elseif ( preg_match("/^\\s*(alter table|create|insert|delete|update|replace) /i",$query) ) {
-            $action = 'write';
-            $details = $db_list[ 'write' ][ mt_rand( 0, count( $db_list[ 'write' ] ) -1 ) ];
-            $this->db_write = $details;
+
+        if ( WP_DEBUG ) {
+            $this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
         } else {
-            $action = '';
-            $details = $db_list[ 'read' ][ mt_rand( 0, count( $db_list[ 'read' ] ) -1 ) ];
-            $this->db_read = $details;
-        }
-
-        $dbhname = "dbh" . $action;
-        $this->$dbhname = @mysql_connect( $details[ 'db_host' ], $details[ 'db_user' ], $details[ 'db_password' ] );
-        if (!$this->$dbhname ) {
+            $this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
+        }
+
+        if ( !$this->dbh ) {
             $this->bail( sprintf( /*WP_I18N_DB_CONN_ERROR*/"
 <h1>Error establishing a database connection</h1>
@@ -1050 +1049 @@
 </ul>
 <p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>
-"/*/WP_I18N_DB_CONN_ERROR*/, $details['db_host'] ), 'db_connect_fail' );
-        }
-        $this->select( $details[ 'db_name' ], $this->$dbhname );
+"/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' );
+
+            // If show errors is disabled then we need to die anyway as we don't have a working DB connection
+            // unless we're trying to test the initial connection, in which case setup-config.php will handle.
+            if ( defined( 'WP_SETUP_CONFIG' ) )
+                return;
+
+            die();
+        }
+
+        $this->set_charset( $this->dbh );
+
+        $this->ready = true;
+
+        $this->select( $this->dbname, $this->dbh );
     }
 
@@ -1085 +1096 @@
             $this->timer_start();
 
-        // use $this->dbh for read ops, and $this->dbhwrite for write ops
-        // use $this->dbhglobal for gloal table ops
-        unset( $dbh );
-        if( defined( 'WP_USE_MULTIPLE_DB' ) && WP_USE_MULTIPLE_DB ) {
-            if( $this->blogs != '' && preg_match("/(" . $this->blogs . "|" . $this->users . "|" . $this->usermeta . "|" . $this->site . "|" . $this->sitemeta . "|" . $this->sitecategories . ")/i",$query) ) {
-                if( false == isset( $this->dbhglobal ) ) {
-                    $this->db_connect( $query );
-                }
-                $dbh =& $this->dbhglobal;
-                $this->last_db_used = "global";
-            } elseif ( preg_match("/^\\s*(alter table|create|insert|delete|update|replace) /i",$query) ) {
-                if( false == isset( $this->dbhwrite ) ) {
-                    $this->db_connect( $query );
-                }
-                $dbh =& $this->dbhwrite;
-                $this->last_db_used = "write";
-            } else {
-                $dbh =& $this->dbh;
-                $this->last_db_used = "read";
-            }
-        } else {
-            $dbh =& $this->dbh;
-            $this->last_db_used = "other/read";
-        }
-
-        $this->result = @mysql_query( $query, $dbh );
+        $this->result = @mysql_query( $query, $this->dbh );
         $this->num_queries++;
 
@@ -1117 +1103 @@
 
         // If there is an error then take note of it..
-        if ( $this->last_error = mysql_error( $dbh ) ) {
+        if ( $this->last_error = mysql_error( $this->dbh ) ) {
             $this->print_error();
             return false;
@@ -1123 +1109 @@
 
         if ( preg_match( "/^\\s*(insert|delete|update|replace|alter) /i", $query ) ) {
-            $this->rows_affected = mysql_affected_rows( $dbh );
+            $this->rows_affected = mysql_affected_rows( $this->dbh );
             // Take note of the insert_id
             if ( preg_match( "/^\\s*(insert|replace) /i", $query ) ) {
-                $this->insert_id = mysql_insert_id($dbh);
+                $this->insert_id = mysql_insert_id($this->dbh);
             }
             // Return number of rows affected
@@ -1532 +1518 @@
      * Determine if a database supports a particular feature
      *
-     * @since 2.7
+     * @since 2.7.0
      * @see   wpdb::db_version()
      *
@@ -1546 +1532 @@
             case 'subqueries' :   // @since 2.7
                 return version_compare( $version, '4.1', '>=' );
+            case 'set_charset' :
+                return version_compare($version, '5.0.7', '>=');
         };
 
@@ -1577 +1565 @@
      * The database version number.
      *
+     * @since 2.7.0
+     *
      * @return false|string false on failure, version number on success
      */
@@ -1584 +1574 @@
 }
 
-if ( ! isset( $wpdb ) ) {
-    /**
-     * WordPress Database Object, if it isn't set already in wp-content/db.php
-     * @global object $wpdb Creates a new wpdb object based on wp-config.php Constants for the database
-     * @since 0.71
-     */
-    $wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
-}
 ?>