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

 /**
  * The PEAR DB driver for PHP's sqlite extension
  * for interacting with SQLite 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     Urs Gehrig <urs@circle.ch>
  * @author     Mika Tuupola <tuupola@appelsiini.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 3.0
- * @version    CVS: $Id: sqlite.php,v 1.109 2005/03/10 01:22:48 danielc Exp $
+ * @version    CVS: $Id$
  * @link       http://pear.php.net/package/DB
  */
 /**
  * @category   Database
  * @package    DB
  * @author     Urs Gehrig <urs@circle.ch>
  * @author     Mika Tuupola <tuupola@appelsiini.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 3.0
- * @version    Release: 1.7.6
+ * @version    Release: 1.9.2
  * @link       http://pear.php.net/package/DB
  */
 class DB_sqlite extends DB_common
+{
     // {{{ properties
     // }}}
     // {{{ constructor
     /**
-     * This constructor calls <kbd>$this->DB_common()</kbd>
+     * This constructor calls <kbd>parent::__construct()</kbd>
+     *
      * @return void
      */
-    function DB_sqlite()
+    function __construct()
+    {
-        $this->DB_common();
+        parent::__construct();
+    }
      * $dsn = 'sqlite:///path/and/name/of/db/file?mode=0400';
      * $options = array(
      *     'portability' => DB_PORTABILITY_ALL,
      * );
+     *
-     * $db =& DB::connect($dsn, $options);
+     * $db = DB::connect($dsn, $options);
      * if (PEAR::isError($db)) {
      *     die($db->getMessage());
      * }
      * </code>
+     *
         $this->dsn = $dsn;
         if ($dsn['dbsyntax']) {
             $this->dbsyntax = $dsn['dbsyntax'];
+        }
+        if (!$dsn['database']) {
+            return $this->sqliteRaiseError(DB_ERROR_ACCESS_VIOLATION);
+        }
-        if ($dsn['database']) {
+        if ($dsn['database'] !== ':memory:') {
             if (!file_exists($dsn['database'])) {
                 if (!touch($dsn['database'])) {
                     return $this->sqliteRaiseError(DB_ERROR_NOT_FOUND);
+                }
                 return $this->sqliteRaiseError(DB_ERROR_INVALID);
+            }
             if (!is_readable($dsn['database'])) {
                 return $this->sqliteRaiseError(DB_ERROR_ACCESS_VIOLATION);
+            }
-        } else {
-            return $this->sqliteRaiseError(DB_ERROR_ACCESS_VIOLATION);
+        }
         $connect_function = $persistent ? 'sqlite_popen' : 'sqlite_open';
         // track_errors must remain on for simpleQuery()
-        ini_set('track_errors', 1);
+        @ini_set('track_errors', 1);
         $php_errormsg = '';
      *                + 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 ($fetchmode & DB_FETCHMODE_ASSOC) {
             $arr = @sqlite_fetch_array($result, SQLITE_ASSOC);
             if ($this->options['portability'] & DB_PORTABILITY_LOWERCASE && $arr) {
                 $arr = array_change_key_case($arr, CASE_LOWER);
+            }
+            /* Remove extraneous " characters from the fields in the result.
+             * Fixes bug #11716. */
+            if (is_array($arr) && count($arr) > 0) {
+                $strippedArr = array();
+                foreach ($arr as $field => $value) {
+                    $strippedArr[trim($field, '"')] = $value;
+                }
+                $arr = $strippedArr;
+            }
         } else {
             $arr = @sqlite_fetch_array($result, SQLITE_NUM);
+        }
         if (!$arr) {
             return null;
      * @return integer  the DB error number
      */
     function errorCode($errormsg)
+    {
         static $error_regexps;
+        // PHP 5.2+ prepends the function name to $php_errormsg, so we need
+        // this hack to work around it, per bug #9599.
+        $errormsg = preg_replace('/^sqlite[a-z_]+\(\): /', '', $errormsg);
         if (!isset($error_regexps)) {
             $error_regexps = array(
                 '/^no such table:/' => DB_ERROR_NOSUCHTABLE,
                 '/^no such index:/' => DB_ERROR_NOT_FOUND,
                 '/^(table|index) .* already exists$/' => DB_ERROR_ALREADY_EXISTS,
                 '/is not unique/' => DB_ERROR_CONSTRAINT,
                 '/columns .* are not unique/i' => DB_ERROR_CONSTRAINT,
                 '/uniqueness constraint failed/' => DB_ERROR_CONSTRAINT,
                 '/may not be NULL/' => DB_ERROR_CONSTRAINT_NOT_NULL,
                 '/^no such column:/' => DB_ERROR_NOSUCHFIELD,
+                '/no column named/' => DB_ERROR_NOSUCHFIELD,
                 '/column not present in both tables/i' => DB_ERROR_NOSUCHFIELD,
                 '/^near ".*": syntax error$/' => DB_ERROR_SYNTAX,
                 '/[0-9]+ values for [0-9]+ columns/i' => DB_ERROR_VALUE_COUNT_ON_ROW,
             );
+        }
+            }
             $flags = '';
             if ($id[$i]['pk']) {
+                $flags .= 'primary_key ';
+                if (strtoupper($type) == 'INTEGER') {
+                    $flags .= 'auto_increment ';
                 $flags .= 'primary_key ';
+            }
             if ($id[$i]['notnull']) {
                 $flags .= 'not_null ';
+            }

Subversion Repositories Applications.gtt

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