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

 /**
  * The PEAR DB driver for PHP's mysql 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
+ *
  * @category   Database
  * @package    DB
  * @author     Stig Bakken <ssb@php.net>
  * @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: mysql.php,v 1.117 2005/03/29 15:03:26 danielc Exp $
+ * @version    CVS: $Id$
  * @link       http://pear.php.net/package/DB
  */
 /**
+ *
  * @category   Database
  * @package    DB
  * @author     Stig Bakken <ssb@php.net>
  * @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
  */
 class DB_mysql extends DB_common
+{
     // {{{ properties
 => 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
     // }}}
     // {{{ constructor
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
+     *
      * @return void
      */
-    function DB_mysql()
+    function __construct()
+    {
-        $this->DB_common();
+        parent::__construct();
+    }
         $php_errormsg = '';
         if ($ini) {
             $this->connection = @call_user_func_array($connect_function,
                                                       $params);
         } else {
-            ini_set('track_errors', 1);
+            @ini_set('track_errors', 1);
             $this->connection = @call_user_func_array($connect_function,
                                                       $params);
-            ini_set('track_errors', $ini);
+            @ini_set('track_errors', $ini);
+        }
         if (!$this->connection) {
             if (($err = @mysql_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 (!@mysql_select_db($this->_db, $this->connection)) {
                 return $this->mysqlRaiseError(DB_ERROR_NODBSELECTED);
+     *
      * @see DB_result::free()
      */
     function freeResult($result)
+    {
-        return @mysql_free_result($result);
+        return is_resource($result) ? mysql_free_result($result) : false;
+    }
     // }}}
+     *
      * @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 @mysql_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 . '`';
-    }
-    // }}}
-    // {{{ quote()
-    /**
-     * @deprecated  Deprecated in release 1.6.0
-     */
-    function quote($str)
-    {
-        return $this->quoteSmart($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::tableInfo()
      */
     function tableInfo($result, $mode = null)
+    {
         if (is_string($result)) {
+            // Fix for bug #11580.
+            if ($this->_db) {
+                if (!@mysql_select_db($this->_db, $this->connection)) {
+                    return $this->mysqlRaiseError(DB_ERROR_NODBSELECTED);
+                }
+            }
             /*
              * Probably received a table name.
              * Create a result resource identifier.
              */
-            $id = @mysql_list_fields($this->dsn['database'],
+            $id = @mysql_query("SELECT * FROM $result LIMIT 0",
-                                     $result, $this->connection);
+                               $this->connection);
             $got_string = true;
         } elseif (isset($result->result)) {
             /*
              * Probably received a result object.
              * Extract the result resource identifier.

Subversion Repositories Applications.gtt

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