site_iri: comparison web/wp-includes/wp-db.php

equal deleted inserted replaced

-:f507feede89a
+:09a1c134465b
 	var $num_queries = 0;
 	/**
 	 * Count of rows returned by previous query
 	 *
-	 * @since 1.2.0
+	 * @since 0.71
 	 * @access private
 	 * @var int
 	 */
 	var $num_rows = 0;
 	 * @var int
 	 */
 	var $insert_id = 0;
 	/**
-	 * Saved result of the last query made
+	 * Last query made
 	 *
-	 * @since 1.2.0
+	 * @since 0.71
 	 * @access private
 	 * @var array
 	 */
 	var $last_query;
 	/**
 	 * Results of the last query made
 	 *
-	 * @since 1.0.0
+	 * @since 0.71
 	 * @access private
 	 * @var array|null
 	 */
 	var $last_result;
 	/**
+	 * MySQL result, which is either a resource or boolean.
+	 *
+	 * @since 0.71
+	 * @access protected
+	 * @var mixed
+	 */
+	protected $result;
+	/**
 	 * Saved info on the table column
 	 *
-	 * @since 1.2.0
+	 * @since 0.71
-	 * @access private
+	 * @access protected
 	 * @var array
 	 */
-	var $col_info;
+	protected $col_info;
 	/**
 	 * Saved queries that were executed
 	 *
 	 * @since 1.5.0
 	 *
 	 * You can set this to have multiple WordPress installations
 	 * in a single database. The second reason is for possible
 	 * security precautions.
 	 *
-	 * @since 0.71
+	 * @since 2.5.0
 	 * @access private
 	 * @var string
 	 */
 	var $prefix = '';
 	/**
 	 * Whether the database queries are ready to start executing.
 	 *
-	 * @since 2.5.0
+	 * @since 2.3.2
 	 * @access private
 	 * @var bool
 	 */
 	var $ready = false;
 	/**
 	 * Database Username
 	 *
 	 * @since 2.9.0
-	 * @access private
+	 * @access protected
 	 * @var string
 	 */
-	var $dbuser;
+	protected $dbuser;
+	/**
+	 * Database Password
+	 *
+	 * @since 3.1.0
+	 * @access protected
+	 * @var string
+	 */
+	protected $dbpassword;
+	/**
+	 * Database Name
+	 *
+	 * @since 3.1.0
+	 * @access protected
+	 * @var string
+	 */
+	protected $dbname;
+	/**
+	 * Database Host
+	 *
+	 * @since 3.1.0
+	 * @access protected
+	 * @var string
+	 */
+	protected $dbhost;
+	/**
+	 * Database Handle
+	 *
+	 * @since 0.71
+	 * @access protected
+	 * @var string
+	 */
+	protected $dbh;
 	/**
 	 * A textual description of the last query/get_row/get_var call
 	 *
 	 * @since 3.0.0
 	 * @param string $dbpassword MySQL database password
 	 * @param string $dbname MySQL database name
 	 * @param string $dbhost MySQL database host
 	 */
 	function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
-		register_shutdown_function( array( &$this, '__destruct' ) );
+		register_shutdown_function( array( $this, '__destruct' ) );
 		if ( WP_DEBUG )
 			$this->show_errors();
 		$this->init_charset();
 	 * @since 2.0.8
 	 * @return bool true
 	 */
 	function __destruct() {
 		return true;
+	}
+	/**
+	 * PHP5 style magic getter, used to lazy-load expensive data.
+	 *
+	 * @since 3.5.0
+	 *
+	 * @param string $name The private member to get, and optionally process
+	 * @return mixed The private member
+	 */
+	function __get( $name ) {
+		if ( 'col_info' == $name )
+			$this->load_col_info();
+		return $this->$name;
+	}
+	/**
+	 * Magic function, for backwards compatibility
+	 *
+	 * @since 3.5.0
+	 *
+	 * @param string $name  The private member to set
+	 * @param mixed  $value The value to set
+	 */
+	function __set( $name, $value ) {
+		$this->$name = $value;
+	}
+	/**
+	 * Magic function, for backwards compatibility
+	 *
+	 * @since 3.5.0
+	 *
+	 * @param string $name  The private member to check
+	 *
+	 * @return bool If the member is set or not
+	 */
+	function __isset( $name ) {
+		return isset( $this->$name );
+	}
+	/**
+	 * Magic function, for backwards compatibility
+	 *
+	 * @since 3.5.0
+	 *
+	 * @param string $name  The private member to unset
+	 */
+	function __unset( $name ) {
+		unset( $this->$name );
 	}
 	/**
 	 * Set $this->charset and $this->collate
 	 *
 	 * @since 2.3.0
 	 * @param string $string to escape
 	 * @return void
 	 */
 	function escape_by_ref( &$string ) {
-		$string = $this->_real_escape( $string );
+		if ( ! is_float( $string ) )
+			$string = $this->_real_escape( $string );
 	}
 	/**
 	 * Prepares a SQL query for safe execution. Uses sprintf()-like syntax.
 	 *
 	 * @param mixed $args,... further variables to substitute into the query's placeholders if being called like
 	 * 	{@link http://php.net/sprintf sprintf()}.
 	 * @return null|false|string Sanitized query string, null if there is no query, false if there is an error and string
 	 * 	if there was something to prepare
 	 */
-	function prepare( $query = null ) { // ( $query, *$args )
+	function prepare( $query, $args ) {
 		if ( is_null( $query ) )
 			return;
 		$args = func_get_args();
 		array_shift( $args );
 		// If args were passed as an array (as in vsprintf), move them up
 		if ( isset( $args[0] ) && is_array($args[0]) )
 			$args = $args[0];
 		$query = str_replace( "'%s'", '%s', $query ); // in case someone mistakenly already singlequoted it
 		$query = str_replace( '"%s"', '%s', $query ); // doublequote unquoting
+		$query = preg_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' ) );
+		array_walk( $args, array( $this, 'escape_by_ref' ) );
 		return @vsprintf( $query, $args );
 	}
 	/**
 	 * Print SQL/DB error.
 		if ( $caller = $this->get_caller() )
 			$error_str = sprintf( __( 'WordPress database error %1$s for query %2$s made by %3$s' ), $str, $this->last_query, $caller );
 		else
 			$error_str = sprintf( __( 'WordPress database error %1$s for query %2$s' ), $str, $this->last_query );
-		if ( function_exists( 'error_log' )
+		error_log( $error_str );
-			&& ( $log_file = @ini_get( 'error_log' ) )
-			&& ( 'syslog' == $log_file || @is_writable( $log_file ) )
-			)
-			@error_log( $error_str );
 		// Are we showing errors?
 		if ( ! $this->show_errors )
 			return false;
 	 */
 	function flush() {
 		$this->last_result = array();
 		$this->col_info    = null;
 		$this->last_query  = null;
+		if ( is_resource( $this->result ) )
+			mysql_free_result( $this->result );
 	}
 	/**
 	 * Connect to and select database
 	 *
 	 */
 	function db_connect() {
 		$this->is_mysql = true;
+		$new_link = defined( 'MYSQL_NEW_LINK' ) ? MYSQL_NEW_LINK : true;
+		$client_flags = defined( 'MYSQL_CLIENT_FLAGS' ) ? MYSQL_CLIENT_FLAGS : 0;
 		if ( WP_DEBUG ) {
-			$this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
+			$this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
 		} else {
-			$this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, true );
+			$this->dbh = @mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
 		}
 		if ( !$this->dbh ) {
 			wp_load_translations_early();
 			$this->bail( sprintf( __( "
 		if ( $this->last_error = mysql_error( $this->dbh ) ) {
 			$this->print_error();
 			return false;
 		}
-		if ( preg_match( '/^\s*(create|alter|truncate|drop) /i', $query ) ) {
+		if ( preg_match( '/^\s*(create|alter|truncate|drop)\s/i', $query ) ) {
 			$return_val = $this->result;
-		} elseif ( preg_match( '/^\s*(insert|delete|update|replace) /i', $query ) ) {
+		} elseif ( preg_match( '/^\s*(insert|delete|update|replace)\s/i', $query ) ) {
 			$this->rows_affected = mysql_affected_rows( $this->dbh );
 			// Take note of the insert_id
-			if ( preg_match( '/^\s*(insert|replace) /i', $query ) ) {
+			if ( preg_match( '/^\s*(insert|replace)\s/i', $query ) ) {
 				$this->insert_id = mysql_insert_id($this->dbh);
 			}
 			// Return number of rows affected
 			$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 ) ) {
 				$this->last_result[$num_rows] = $row;
 				$num_rows++;
 			}
-			@mysql_free_result( $this->result );
 			// Log number of rows the query returned
 			// and return number of rows selected
 			$this->num_rows = $num_rows;
 			$return_val     = $num_rows;
 		}
 		return null;
 	}
 	/**
+	 * 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.
 	 *
 	 * @since 0.71
 	 *
 	 * @param string $info_type Optional. Type one of name, table, def, max_length, not_null, primary_key, multiple_key, unique_key, numeric, blob, type, unsigned, zerofill
 	 * @param int $col_offset Optional. 0: col name. 1: which table the col's in. 2: col's max length. 3: if the col is numeric. 4: col's type
 	 * @return mixed Column Results
 	 */
 	function get_col_info( $info_type = 'name', $col_offset = -1 ) {
+		$this->load_col_info();
 		if ( $this->col_info ) {
 			if ( $col_offset == -1 ) {
 				$i = 0;
 				$new_array = array();
 				foreach( (array) $this->col_info as $col ) {
 	}
 	/**
 	 * Wraps errors in a nice header and footer and dies.
 	 *
-	 * Will not die if wpdb::$show_errors is true
+	 * Will not die if wpdb::$show_errors is false.
 	 *
 	 * @since 1.5.0
 	 *
 	 * @param string $message The Error message
 	 * @param string $error_code Optional. A Computer readable string to identify the error.
 	 * Whether the database supports collation.
 	 *
 	 * Called when WordPress is generating the table scheme.
 	 *
 	 * @since 2.5.0
+	 * @deprecated 3.5.0
+	 * @deprecated Use wpdb::has_cap( 'collation' )
 	 *
 	 * @return bool True if collation is supported, false if version does not
 	 */
 	function supports_collation() {
+		_deprecated_function( __FUNCTION__, '3.5', 'wpdb::has_cap( \'collation\' )' );
 		return $this->has_cap( 'collation' );
+	}
+	/**
+	 * The database character collate.
+	 *
+	 * @since 3.5.0
+	 *
+	 * @return string The database character collate.
+	 */
+	public function get_charset_collate() {
+		$charset_collate = '';
+		if ( ! empty( $this->charset ) )
+			$charset_collate = "DEFAULT CHARACTER SET $this->charset";
+		if ( ! empty( $this->collate ) )
+			$charset_collate .= " COLLATE $this->collate";
+		return $charset_collate;
 	}
 	/**
 	 * Determine if a database supports a particular feature
 	 *

changeset 204	09a1c134465b
parent 194	32102edaa81b