WebSVN – Applications.gtt – Diff – /trunk/bibliotheque/pear/DB/mysqli.php

 /**
  * The PEAR DB driver for PHP's mysqli extension
  * for interacting with MySQL databases
  *
- * PHP versions 4 and 5
+ * PHP version 5
+ *
  * LICENSE: This source file is subject to version 3.0 of the PHP license
  * that is available through the world-wide-web at the following URI:
  * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
  * the PHP License and are unable to obtain it through the web, please
  * send a note to license@php.net so we can mail you a copy immediately.
+ *
  * @category   Database
  * @package    DB
  * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: mysqli.php,v 1.69 2005/03/04 23:12:36 danielc Exp $
+ * @version    CVS: $Id$
  * @link       http://pear.php.net/package/DB
  */
  * These methods overload the ones declared in DB_common.
+ *
  * @category   Database
  * @package    DB
  * @author     Daniel Convissor <danielc@php.net>
- * @copyright  1997-2005 The PHP Group
+ * @copyright  1997-2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.6
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  * @since      Class functional since Release 1.6.3
  */
 class DB_mysqli extends DB_common
+{
 => DB_ERROR_VALUE_COUNT_ON_ROW,
 => DB_ERROR_ACCESS_VIOLATION,
 => DB_ERROR_NOSUCHTABLE,
 => DB_ERROR_CONSTRAINT,
 => DB_ERROR_CONSTRAINT,
+=> DB_ERROR_DIVZERO,
+=> DB_ERROR_CONSTRAINT,
+=> DB_ERROR_CONSTRAINT,
     );
     /**
      * The raw database connection created by PHP
         MYSQLI_TYPE_LONG_BLOB   => 'longblob',
         MYSQLI_TYPE_BLOB        => 'blob',
         MYSQLI_TYPE_VAR_STRING  => 'varchar',
         MYSQLI_TYPE_STRING      => 'char',
         MYSQLI_TYPE_GEOMETRY    => 'geometry',
+        /* These constants are conditionally compiled in ext/mysqli, so we'll
+         * define them by number rather than constant. */
+=> 'bit',
+=> 'decimal',
     );
     // }}}
     // {{{ constructor
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
      *
      * @return void
      */
-    function DB_mysqli()
+    function __construct()
+    {
-        $this->DB_common();
+        parent::__construct();
+     *
      * $options = array(
      *     'ssl' => true,
      * );
+     *
-     * $db =& DB::connect($dsn, $options);
+     * $db = DB::connect($dsn, $options);
      * if (PEAR::isError($db)) {
      *     die($db->getMessage());
      * }
      * </code>
+     *
         if ($dsn['dbsyntax']) {
             $this->dbsyntax = $dsn['dbsyntax'];
+        }
         $ini = ini_get('track_errors');
-        ini_set('track_errors', 1);
+        @ini_set('track_errors', 1);
         $php_errormsg = '';
-        if ($this->getOption('ssl') === true) {
+        if (((int) $this->getOption('ssl')) === 1) {
             $init = mysqli_init();
             mysqli_ssl_set(
                 $init,
                 $dsn['port'],
                 $dsn['socket']
             );
+        }
-        ini_set('track_errors', $ini);
+        @ini_set('track_errors', $ini);
         if (!$this->connection) {
             if (($err = @mysqli_connect_error()) != '') {
      *                + the DB_OK constant for other successful queries
      *                + a DB_Error object on failure
      */
     function simpleQuery($query)
+    {
-        $ismanip = DB::isManip($query);
+        $ismanip = $this->_checkManip($query);
         $this->last_query = $query;
         $query = $this->modifyQuery($query);
         if ($this->_db) {
             if (!@mysqli_select_db($this->connection, $this->_db)) {
                 return $this->mysqliRaiseError(DB_ERROR_NODBSELECTED);
+     *
      * @see DB_result::free()
      */
     function freeResult($result)
+    {
+        if (! $result instanceof mysqli_result) {
+            return false;
+        }
-        return @mysqli_free_result($result);
+        mysqli_free_result($result);
+        return true;
+    }
     // }}}
+     *
      * @return int  the number of rows.  A DB_Error object on failure.
      */
     function affectedRows()
+    {
-        if (DB::isManip($this->last_query)) {
+        if ($this->_last_query_manip) {
             return @mysqli_affected_rows($this->connection);
         } else {
             return 0;
+        }
+     }
     // }}}
     // {{{ quoteIdentifier()
     /**
+     * Quotes a string so it can be safely used as a table or column name
-     * Quotes a string so it can be safely used as a table or column name
+     * (WARNING: using names that require this is a REALLY BAD IDEA)
      *
-     * MySQL can't handle the backtick character (<kbd>`</kbd>) in
+     * WARNING:  Older versions of MySQL can't handle the backtick
-     * table or column names.
+     * character (<kbd>`</kbd>) in table or column names.
+     *
      * @param string $str  identifier name to be quoted
+     *
      * @return string  quoted identifier string
+     *
      * @see DB_common::quoteIdentifier()
      * @since Method available since Release 1.6.0
      */
     function quoteIdentifier($str)
     {
-        return '`' . $str . '`';
+        return '`' . str_replace('`', '``', $str) . '`';
+    }
+     *
      * @access protected
      */
     function modifyLimitQuery($query, $from, $count, $params = array())
+    {
-        if (DB::isManip($query)) {
+        if (DB::isManip($query) || $this->_next_query_manip) {
             return $query . " LIMIT $count";
         } else {
             return $query . " LIMIT $from, $count";
+        }
+    }
      * @see DB_common::setOption()
      */
     function tableInfo($result, $mode = null)
+    {
         if (is_string($result)) {
+            // Fix for bug #11580.
+            if ($this->_db) {
+                if (!@mysqli_select_db($this->connection, $this->_db)) {
+                    return $this->mysqliRaiseError(DB_ERROR_NODBSELECTED);
+                }
+            }
             /*
              * Probably received a table name.
              * Create a result resource identifier.
              */
             $id = @mysqli_query($this->connection,
              */
             $id = $result;
             $got_string = false;
+        }
-        if (!is_a($id, 'mysqli_result')) {
+        if (!is_object($id) || !is_a($id, 'mysqli_result')) {
             return $this->mysqliRaiseError(DB_ERROR_NEED_MORE_DATA);
+        }
                 'table' => $case_func($tmp->table),
                 'name'  => $case_func($tmp->name),
                 'type'  => isset($this->mysqli_types[$tmp->type])
                                     ? $this->mysqli_types[$tmp->type]
                                     : 'unknown',
+                // http://bugs.php.net/?id=36579
+                //  Doc Bug #36579: mysqli_fetch_field length handling
+                // https://bugs.php.net/bug.php?id=62426
+                //  Bug #62426: mysqli_fetch_field_direct returns incorrect
+                //  length on UTF8 fields
-                'len'   => $tmp->max_length,
+                'len'   => $tmp->length,
                 'flags' => $flags,
             );
             if ($mode & DB_TABLEINFO_ORDER) {

Subversion Repositories Applications.gtt

(root)/trunk/bibliotheque/pear/DB/mysqli.php – Rev 94 → 187