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

 /* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 /**
  * Database independent query interface
  *
- * 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     Tomas V.V.Cox <cox@idecnet.com>
  * @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: DB.php,v 1.80 2005/02/16 02:16:00 danielc Exp $
+ * @version    CVS: $Id$
  * @link       http://pear.php.net/package/DB
  */
 /**
  * @category   Database
  * @package    DB
  * @author     Stig Bakken <ssb@php.net>
  * @author     Tomas V.V.Cox <cox@idecnet.com>
  * @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
+{
-    // {{{ &factory()
+    // {{{ factory()
     /**
      * Create a new DB object for the specified database type but don't
      * connect to the database
+     *
      * @return object  a new DB object.  A DB_Error object on failure.
+     *
      * @see DB_common::setOption()
      */
-    function &factory($type, $options = false)
+    public static function factory($type, $options = false)
+    {
         if (!is_array($options)) {
             $options = array('persistent' => $options);
+        }
                                     . " file for '$dsn'",
                                     'DB_Error', true);
             return $tmp;
+        }
-        @$obj =& new $classname;
+        @$obj = new $classname;
         foreach ($options as $option => $value) {
             $test = $obj->setOption($option, $value);
         return $obj;
+    }
     // }}}
-    // {{{ &connect()
+    // {{{ connect()
     /**
      * $options = array(
      *     'debug'       => 2,
      *     'portability' => DB_PORTABILITY_ALL,
      * );
+     *
-     * $db =& DB::connect($dsn, $options);
+     * $db = DB::connect($dsn, $options);
      * if (PEAR::isError($db)) {
      *     die($db->getMessage());
      * }
      * </code>
+     *
      *       DB_odbc::connect(), DB_pgsql::connect(), DB_sqlite::connect(),
      *       DB_sybase::connect()
+     *
      * @uses DB::parseDSN(), DB_common::setOption(), PEAR::isError()
      */
-    function &connect($dsn, $options = array())
+    public static function connect($dsn, $options = array())
+    {
         $dsninfo = DB::parseDSN($dsn);
         $type = $dsninfo['phptype'];
         $classname = "DB_${type}";
         if (!class_exists($classname)) {
             $tmp = PEAR::raiseError(null, DB_ERROR_NOT_FOUND, null, null,
                                     "Unable to include the DB/{$type}.php"
+                                    . " file for '"
-                                    . " file for '$dsn'",
+                                    . DB::getDSNString($dsn, true) . "'",
                                     'DB_Error', true);
             return $tmp;
         }
-        @$obj =& new $classname;
+        @$obj = new $classname;
         foreach ($options as $option => $value) {
             $test = $obj->setOption($option, $value);
             if (DB::isError($test)) {
                 return $test;
+            }
+        }
+        $err = $obj->connect($dsninfo, $obj->getOption('persistent'));
-        }
+        if (DB::isError($err)) {
+            if (is_array($dsn)) {
                 $err->addUserInfo(DB::getDSNString($dsn, true));
-        $err = $obj->connect($dsninfo, $obj->getOption('persistent'));
+            } else {
-        if (DB::isError($err)) {
+                $err->addUserInfo($dsn);
             $err->addUserInfo($dsn);
+     *
      * @return string  the DB API version number
      */
     function apiVersion()
+    {
-        return '1.7.6';
+        return '1.9.2';
+    }
     // }}}
+     *
      * @param mixed $value  the variable to check
+     *
      * @return bool  whether $value is DB_Error object
      */
-    function isError($value)
+    public static function isError($value)
+    {
-        return is_a($value, 'DB_Error');
+        return is_object($value) && is_a($value, 'DB_Error');
+    }
     // }}}
+     *
      * @param mixed $value  the value to test
+     *
      * @return bool  whether $value is a DB_<driver> object
      */
-    function isConnection($value)
+    public static function isConnection($value)
+    {
         return (is_object($value) &&
                 is_subclass_of($value, 'db_common') &&
                 method_exists($value, 'simpleQuery'));
+    }
+     *
      * @param string $query  the query
+     *
      * @return boolean  whether $query is a data manipulation query
      */
-    function isManip($query)
+    public static function isManip($query)
+    {
         $manips = 'INSERT|UPDATE|DELETE|REPLACE|'
                 . 'CREATE|DROP|'
-                . 'LOAD DATA|SELECT .* INTO|COPY|'
+                . 'LOAD DATA|SELECT .* INTO .* FROM|COPY|'
                 . 'ALTER|GRANT|REVOKE|'
                 . 'LOCK|UNLOCK';
         if (preg_match('/^\s*"?(' . $manips . ')\s+/i', $query)) {
             return true;
+        }
      * @param integer $value  the DB error code
+     *
      * @return string  the error message or false if the error code was
      *                  not recognized
      */
-    function errorMessage($value)
+    public static function errorMessage($value)
+    {
         static $errorMessages;
         if (!isset($errorMessages)) {
             $errorMessages = array(
                 DB_ERROR                    => 'unknown error',
      *  + hostspec: Host specification (hostname[:port])
      *  + database: Database to use on the DBMS server
      *  + username: User name for login
      *  + password: Password for login
      */
-    function parseDSN($dsn)
+    public static function parseDSN($dsn)
+    {
         $parsed = array(
             'phptype'  => false,
             'dbsyntax' => false,
             'username' => false,
+        }
         // process the different protocol options
         $parsed['protocol'] = (!empty($proto)) ? $proto : 'tcp';
+        $proto_opts = rawurldecode($proto_opts);
+        if (strpos($proto_opts, ':') !== false) {
+            list($proto_opts, $parsed['port']) = explode(':', $proto_opts);
         $proto_opts = rawurldecode($proto_opts);
-        if ($parsed['protocol'] == 'tcp') {
-            if (strpos($proto_opts, ':') !== false) {
-                list($parsed['hostspec'],
-                     $parsed['port']) = explode(':', $proto_opts);
-            } else {
+        if ($parsed['protocol'] == 'tcp') {
-                $parsed['hostspec'] = $proto_opts;
             $parsed['hostspec'] = $proto_opts;
         } elseif ($parsed['protocol'] == 'unix') {
             $parsed['socket'] = $proto_opts;
+        }
         return $parsed;
+    }
+    // }}}
+    // {{{ getDSNString()
+    /**
+     * Returns the given DSN in a string format suitable for output.
+     *
+     * @param array|string the DSN to parse and format
+     * @param boolean true to hide the password, false to include it
+     * @return string
+     */
+    public static function getDSNString($dsn, $hidePassword) {
+        /* Calling parseDSN will ensure that we have all the array elements
+         * defined, and means that we deal with strings and array in the same
+         * manner. */
+        $dsnArray = DB::parseDSN($dsn);
+        if ($hidePassword) {
+            $dsnArray['password'] = 'PASSWORD';
+        }
+        /* Protocol is special-cased, as using the default "tcp" along with an
+         * Oracle TNS connection string fails. */
+        if (is_string($dsn) && strpos($dsn, 'tcp') === false && $dsnArray['protocol'] == 'tcp') {
+            $dsnArray['protocol'] = false;
+        }
+        // Now we just have to construct the actual string. This is ugly.
+        $dsnString = $dsnArray['phptype'];
+        if ($dsnArray['dbsyntax']) {
+            $dsnString .= '('.$dsnArray['dbsyntax'].')';
+        }
+        $dsnString .= '://'
+                     .$dsnArray['username']
+                     .':'
+                     .$dsnArray['password']
+                     .'@'
+                     .$dsnArray['protocol'];
+        if ($dsnArray['socket']) {
+            $dsnString .= '('.$dsnArray['socket'].')';
+        }
+        if ($dsnArray['protocol'] && $dsnArray['hostspec']) {
+            $dsnString .= '+';
+        }
+        $dsnString .= $dsnArray['hostspec'];
+        if ($dsnArray['port']) {
+            $dsnString .= ':'.$dsnArray['port'];
+        }
+        $dsnString .= '/'.$dsnArray['database'];
+        /* Option handling. Unfortunately, parseDSN simply places options into
+         * the top-level array, so we'll first get rid of the fields defined by
+         * DB and see what's left. */
+        unset($dsnArray['phptype'],
+              $dsnArray['dbsyntax'],
+              $dsnArray['username'],
+              $dsnArray['password'],
+              $dsnArray['protocol'],
+              $dsnArray['socket'],
+              $dsnArray['hostspec'],
+              $dsnArray['port'],
+              $dsnArray['database']
+        );
+        if (count($dsnArray) > 0) {
+            $dsnString .= '?';
+            $i = 0;
+            foreach ($dsnArray as $key => $value) {
+                if (++$i > 1) {
+                    $dsnString .= '&';
+                }
+                $dsnString .= $key.'='.$value;
+            }
+        }
+        return $dsnString;
+    }
     // }}}
+}
  * messages
+ *
  * @category   Database
  * @package    DB
  * @author     Stig Bakken <ssb@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_Error extends PEAR_Error
+{
     // {{{ constructor
      *                           PEAR_ERROR_TRIGGER
      * @param mixed $debuginfo  additional debug info, such as the last query
+     *
      * @see PEAR_Error
      */
-    function DB_Error($code = DB_ERROR, $mode = PEAR_ERROR_RETURN,
+    function __construct($code = DB_ERROR, $mode = PEAR_ERROR_RETURN,
                       $level = E_USER_NOTICE, $debuginfo = null)
+    {
         if (is_int($code)) {
-            $this->PEAR_Error('DB Error: ' . DB::errorMessage($code), $code,
+            parent::__construct('DB Error: ' . DB::errorMessage($code), $code,
                               $mode, $level, $debuginfo);
         } else {
-            $this->PEAR_Error("DB Error: $code", DB_ERROR,
+            parent::__construct("DB Error: $code", DB_ERROR,
                               $mode, $level, $debuginfo);
+        }
+    }
+    /**
+     * Workaround to both avoid the "Redefining already defined constructor"
+     * PHP error and provide backward compatibility in case someone is calling
+     * DB_Error() dynamically
+     */
+    public function __call($method, $arguments)
+    {
+        if ($method == 'DB_Error') {
+            return call_user_func_array(array($this, '__construct'), $arguments);
+        }
+        trigger_error(
+            'Call to undefined method DB_Error::' . $method . '()', E_USER_ERROR
+        );
+    }
     // }}}
+}
  * after processing a query that returns data.
+ *
  * @category   Database
  * @package    DB
  * @author     Stig Bakken <ssb@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_result
+{
     // {{{ properties
      * @param resource $result   the result resource id
      * @param array    $options  an associative array with result options
+     *
      * @return void
      */
-    function DB_result(&$dbh, $result, $options = array())
+    function __construct(&$dbh, $result, $options = array())
+    {
         $this->autofree    = $dbh->options['autofree'];
         $this->dbh         = &$dbh;
         $this->fetchmode   = $dbh->fetchmode;
         $this->fetchmode_object_class = $dbh->fetchmode_object_class;
+        }
         if ($fetchmode === DB_FETCHMODE_OBJECT) {
             $fetchmode = DB_FETCHMODE_ASSOC;
             $object_class = $this->fetchmode_object_class;
+        }
-        if ($this->limit_from !== null) {
+        if (is_null($rownum) && $this->limit_from !== null) {
             if ($this->row_counter === null) {
                 $this->row_counter = $this->limit_from;
                 // Skip rows
                 if ($this->dbh->features['limit'] === false) {
                     $i = 0;
                 // The default mode is specified in the
                 // DB_common::fetchmode_object_class property
                 if ($object_class == 'stdClass') {
                     $arr = (object) $arr;
                 } else {
-                    $arr = &new $object_class($arr);
+                    $arr = new $object_class($arr);
+                }
+            }
             return $arr;
+        }
         if ($res == null && $this->autofree) {
+        }
         if ($fetchmode === DB_FETCHMODE_OBJECT) {
             $fetchmode = DB_FETCHMODE_ASSOC;
             $object_class = $this->fetchmode_object_class;
+        }
-        if ($this->limit_from !== null) {
+        if (is_null($rownum) && $this->limit_from !== null) {
             if ($this->row_counter === null) {
                 $this->row_counter = $this->limit_from;
                 // Skip rows
                 if ($this->dbh->features['limit'] === false) {
                     $i = 0;
+            }
             $i = 0;
             while ($res->fetchInto($tmp, DB_FETCHMODE_ORDERED)) {
                 $i++;
+            }
-            return $i;
+            $count = $i;
         } else {
-            return $this->dbh->numRows($this->result);
+            $count = $this->dbh->numRows($this->result);
+        }
+        /* fbsql is checked for here because limit queries are implemented
+         * using a TOP() function, which results in fbsql_num_rows still
+         * returning the total number of rows that would have been returned,
+         * rather than the real number. As a result, we'll just do the limit
+         * calculations for fbsql in the same way as a database with emulated
+         * limits. Unfortunately, we can't just do this in DB_fbsql::numRows()
+         * because that only gets the result resource, rather than the full
+         * DB_Result object. */
+        if (($this->dbh->features['limit'] === 'emulate'
+             && $this->limit_from !== null)
+            || $this->dbh->phptype == 'fbsql') {
+            $limit_count = is_null($this->limit_count) ? $count : $this->limit_count;
+            if ($count < $this->limit_from) {
+                $count = 0;
+            } elseif ($count < ($this->limit_from + $limit_count)) {
+                $count -= $this->limit_from;
+            } else {
+                $count = $limit_count;
+            }
+        }
+        return $count;
+    }
     // }}}
  * is placed in a property named for the column.
+ *
  * @category   Database
  * @package    DB
  * @author     Stig Bakken <ssb@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
  * @see        DB_common::setFetchMode()
  */
 class DB_row
+{
+     *
      * @param array  the array containing the row's data
+     *
      * @return void
      */
-    function DB_row(&$arr)
+    function __construct(&$arr)
+    {
         foreach ($arr as $key => $value) {
             $this->$key = &$arr[$key];
+        }
+    }

Subversion Repositories Applications.gtt

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