helly Sat Apr 3 09:40:36 2004 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
/php-src/ext/sqlite/tests sqlite_014.phpt sqlite_oo_014.phpt
Log:
Increase severity level and use a more precise error message.
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.138&r2=1.139&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.138 php-src/ext/sqlite/sqlite.c:1.139
--- php-src/ext/sqlite/sqlite.c:1.138 Mon Mar 29 14:49:16 2004
+++ php-src/ext/sqlite/sqlite.c Sat Apr 3 09:40:34 2004
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.138 2004/03/29 19:49:16 helly Exp $
+ $Id: sqlite.c,v 1.139 2004/04/03 14:40:34 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1055,7 +1055,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.138 2004/03/29 19:49:16 helly Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.139 2004/04/03 14:40:34 helly Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
@@ -1810,7 +1810,7 @@
if (res->curr_row >= res->nrows && res->nrows) {
if (!res->buffered) {
- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "One or more
rowsets were already returned");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "One or more
rowsets were already returned; returning NULL this time");
} else {
res->curr_row = 0;
}
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_014.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/sqlite/tests/sqlite_014.phpt
diff -u php-src/ext/sqlite/tests/sqlite_014.phpt:1.3
php-src/ext/sqlite/tests/sqlite_014.phpt:1.4
--- php-src/ext/sqlite/tests/sqlite_014.phpt:1.3 Thu Dec 4 21:12:21 2003
+++ php-src/ext/sqlite/tests/sqlite_014.phpt Sat Apr 3 09:40:36 2004
@@ -61,7 +61,7 @@
}
}
-Notice: sqlite_fetch_all(): One or more rowsets were already returned in
%ssqlite_014.php on line %d
+Warning: sqlite_fetch_all(): One or more rowsets were already returned; returning
NULL this time in %ssqlite_014.php on line %d
array(0) {
}
unbuffered with fetch_array
http://cvs.php.net/diff.php/php-src/ext/sqlite/tests/sqlite_oo_014.phpt?r1=1.7&r2=1.8&ty=u
Index: php-src/ext/sqlite/tests/sqlite_oo_014.phpt
diff -u php-src/ext/sqlite/tests/sqlite_oo_014.phpt:1.7
php-src/ext/sqlite/tests/sqlite_oo_014.phpt:1.8
--- php-src/ext/sqlite/tests/sqlite_oo_014.phpt:1.7 Mon Mar 29 14:49:17 2004
+++ php-src/ext/sqlite/tests/sqlite_oo_014.phpt Sat Apr 3 09:40:36 2004
@@ -59,7 +59,7 @@
}
}
-Notice: SQLiteUnbuffered::fetchAll(): One or more rowsets were already returned in
%ssqlite_oo_014.php on line %d
+Warning: SQLiteUnbuffered::fetchAll(): One or more rowsets were already returned;
returning NULL this time in %ssqlite_oo_014.php on line %d
array(0) {
}
unbuffered with fetch_array
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
