cvs: php-src /ext/pdo_sqlite sqlite_statement.c
| From: | Wez Furlong | Date: | Mon, 28 Feb 2005 01:30:16 +0000 |
| Subject: | cvs: php-src /ext/pdo_sqlite sqlite_statement.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-30630@lists.php.net to get a copy of this message | ||
wez Sun Feb 27 20:30:16 2005 EDT
Modified files:
/php-src/ext/pdo_sqlite sqlite_statement.c
Log:
fix for PECL Bug #3452
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.13&r2=1.14&ty=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.13
php-src/ext/pdo_sqlite/sqlite_statement.c:1.14
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.13 Sun Feb 27 00:20:18 2005
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Sun Feb 27 20:30:14 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sqlite_statement.c,v 1.13 2005/02/27 05:20:18 wez Exp $ */
+/* $Id: sqlite_statement.c,v 1.14 2005/02/28 01:30:14 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -145,7 +145,6 @@
if (S->done) {
return 0;
}
-
i = sqlite3_step(S->stmt);
switch (i) {
case SQLITE_ROW:
@@ -182,11 +181,9 @@
case SQLITE_FLOAT:
case SQLITE3_TEXT:
case SQLITE_BLOB:
- stmt->columns[colno].param_type = PDO_PARAM_STR;
- break;
case SQLITE_NULL:
default:
- stmt->columns[colno].param_type = PDO_PARAM_NULL;
+ stmt->columns[colno].param_type = PDO_PARAM_STR;
break;
}
@@ -204,7 +201,6 @@
pdo_sqlite_error_stmt(stmt);
return 0;
}
-
switch (sqlite3_column_type(S->stmt, colno)) {
case SQLITE_NULL:
*ptr = NULL;