Increase severity level and use a more precise error message.

diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index 97b998eca1c6b68c70191bf2b016dcea5f413230..6d72ce42788834829156383aba87e8908068ca3a 100644 (file)
--- 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 4ad96c475f5d8636572a09c8d578be009d479248..967fcc10fab99187cb09fdb3964c09da7264dc5e 100755 (executable)
--- 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 4b2bd90592bf952ed596c61842f76cc6459e416f..9735a5442c922ffb0cb012fcf7ef160ac767d632 100755 (executable)
--- 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