Increase severity level and use a more precise error message.

helly25 · helly25 · commit de56cc51a8b9 · 2004-04-03T14:40:36.000Z
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1810,7 +1810,7 @@ PHP_FUNCTION(sqlite_fetch_all)`
`1810`	`1810`
`1811`	`1811`	`if (res->curr_row >= res->nrows && res->nrows) {`
`1812`	`1812`	`if (!res->buffered) {`
`1813`		`- php_error_docref(NULL TSRMLS_CC, E_NOTICE, "One or more rowsets were already returned");`
	`1813`	`+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "One or more rowsets were already returned; returning NULL this time");`
`1814`	`1814`	`} else {`
`1815`	`1815`	`res->curr_row = 0;`
`1816`	`1816`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ array(3) {`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`-Notice: sqlite_fetch_all(): One or more rowsets were already returned in %ssqlite_014.php on line %d`
	`64`	`+Warning: sqlite_fetch_all(): One or more rowsets were already returned; returning NULL this time in %ssqlite_014.php on line %d`
`65`	`65`	`array(0) {`
`66`	`66`	`}`
`67`	`67`	`unbuffered with fetch_array`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ array(3) {`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`-Notice: SQLiteUnbuffered::fetchAll(): One or more rowsets were already returned in %ssqlite_oo_014.php on line %d`
	`62`	`+Warning: SQLiteUnbuffered::fetchAll(): One or more rowsets were already returned; returning NULL this time in %ssqlite_oo_014.php on line %d`
`63`	`63`	`array(0) {`
`64`	`64`	`}`
`65`	`65`	`unbuffered with fetch_array`