summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2004-04-03 14:40:36 +0000
committerMarcus Boerger <helly@php.net>2004-04-03 14:40:36 +0000
commitde56cc51a8b90b4ad5addc4159a2746236a3ca6c (patch)
treee50e6cf398b6d2beb48c46f57e9989af4f2e31d4
parent1c7cfe739dd3664a673fb8efc6ecbbd932b7db27 (diff)
downloadphp-git-de56cc51a8b90b4ad5addc4159a2746236a3ca6c.tar.gz
Increase severity level and use a more precise error message.
-rw-r--r--ext/sqlite/sqlite.c2
-rwxr-xr-xext/sqlite/tests/sqlite_014.phpt2
-rwxr-xr-xext/sqlite/tests/sqlite_oo_014.phpt2
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index 97b998eca1..6d72ce4278 100644
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -1810,7 +1810,7 @@ PHP_FUNCTION(sqlite_fetch_all)
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;
}
diff --git a/ext/sqlite/tests/sqlite_014.phpt b/ext/sqlite/tests/sqlite_014.phpt
index 4ad96c475f..967fcc10fa 100755
--- a/ext/sqlite/tests/sqlite_014.phpt
+++ b/ext/sqlite/tests/sqlite_014.phpt
@@ -61,7 +61,7 @@ array(3) {
}
}
-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
diff --git a/ext/sqlite/tests/sqlite_oo_014.phpt b/ext/sqlite/tests/sqlite_oo_014.phpt
index 4b2bd90592..9735a5442c 100755
--- a/ext/sqlite/tests/sqlite_oo_014.phpt
+++ b/ext/sqlite/tests/sqlite_oo_014.phpt
@@ -59,7 +59,7 @@ array(3) {
}
}
-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