cvs: pear /DB/DB sqlite.php
| From: | Mika Tuupola | Date: | Mon, 08 Sep 2003 07:47:31 +0000 |
| Subject: | cvs: pear /DB/DB sqlite.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-12534@lists.php.net to get a copy of this message | ||
tuupola Mon Sep 8 03:47:31 2003 EDT
Modified files:
/pear/DB/DB sqlite.php
Log:
* workaround for bug 22328
# the driver now passes all tests but 10errormap.phpt
Index: pear/DB/DB/sqlite.php
diff -u pear/DB/DB/sqlite.php:1.12 pear/DB/DB/sqlite.php:1.13
--- pear/DB/DB/sqlite.php:1.12 Sun Sep 7 16:09:44 2003
+++ pear/DB/DB/sqlite.php Mon Sep 8 03:47:31 2003
@@ -17,7 +17,7 @@
// | Mika Tuupola <tuupola@appelsiini.net> |
// +----------------------------------------------------------------------+
//
-// $Id: sqlite.php,v 1.12 2003/09/07 20:09:44 tuupola Exp $
+// $Id: sqlite.php,v 1.13 2003/09/08 07:47:31 tuupola Exp $
//
// Database independent query interface definition for the PECL's SQLite
// extension.
@@ -328,16 +328,13 @@
}
}
if ($fetchmode & DB_FETCHMODE_ASSOC ) {
- $arr = sqlite_fetch_array($this->result, SQLITE_ASSOC);
+ $arr = sqlite_fetch_array($result, SQLITE_ASSOC);
} else {
- $arr = sqlite_fetch_array($this->result, SQLITE_NUM);
+ $arr = sqlite_fetch_array($result, SQLITE_NUM);
}
if (!$arr) {
- $errno = sqlite_last_error($this->connection);
- if (!$errno) {
- return null;
- }
- return $this->sqliteRaiseError($errno);
+ /* See: http://bugs.php.net/bug.php?id=22328 */
+ return null;
}
return DB_OK;
}