cvs: php-src /ext/pdo pdo_stmt.c
| From: | Ilia Alshanetsky | Date: | Thu, 07 Jul 2005 15:14:12 +0000 |
| Subject: | cvs: php-src /ext/pdo pdo_stmt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-32760@lists.php.net to get a copy of this message | ||
iliaa Thu Jul 7 11:14:12 2005 EDT
Modified files:
/php-src/ext/pdo pdo_stmt.c
Log:
Return an empty array rather then FALSE in fetchAll() on no results.
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.103&r2=1.104&ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.103 php-src/ext/pdo/pdo_stmt.c:1.104
--- php-src/ext/pdo/pdo_stmt.c:1.103 Thu Jul 7 08:45:40 2005
+++ php-src/ext/pdo/pdo_stmt.c Thu Jul 7 11:14:10 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.103 2005/07/07 12:45:40 wez Exp $ */
+/* $Id: pdo_stmt.c,v 1.104 2005/07/07 15:14:10 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -1293,8 +1293,7 @@
}
if (!do_fetch(stmt, TRUE, data, how, PDO_FETCH_ORI_NEXT, 0, return_all TSRMLS_CC)) {
FREE_ZVAL(data);
- zval_dtor(return_value);
- error = 1;
+ error = 2;
}
}
if (!error) {
@@ -1320,7 +1319,12 @@
if (error) {
PDO_HANDLE_STMT_ERR();
- RETURN_FALSE;
+ if (error != 2) {
+ RETURN_FALSE;
+ } else { /* on no results, return an empty array */
+ array_init(return_value);
+ return;
+ }
}
}
/* }}} */