Merge duplicate identical conditions in PDO (#7638)

This commit is contained in:
hassan 2021-11-10 14:21:04 +02:00 committed by GitHub
parent 8b561d33dc
commit 888bec1be3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1377,9 +1377,9 @@ PHP_METHOD(PDOStatement, fetchAll)
}
if (!error) {
if ((how & PDO_FETCH_GROUP)) {
while (do_fetch(stmt, &data, how | flags, PDO_FETCH_ORI_NEXT, /* offset */ 0, return_all));
} else if (how == PDO_FETCH_KEY_PAIR || (how == PDO_FETCH_USE_DEFAULT && stmt->default_fetch_type == PDO_FETCH_KEY_PAIR)) {
if ((how & PDO_FETCH_GROUP) || how == PDO_FETCH_KEY_PAIR ||
(how == PDO_FETCH_USE_DEFAULT && stmt->default_fetch_type == PDO_FETCH_KEY_PAIR)
) {
while (do_fetch(stmt, &data, how | flags, PDO_FETCH_ORI_NEXT, /* offset */ 0, return_all));
} else {
array_init(return_value);