Skip to content

ext/pdo: Minor refactorings #17461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 15, 2025
Merged

ext/pdo: Minor refactorings #17461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af41c0f
ext/pdo: Rename variable, because i is really not descriptive
Girgias Jan 9, 2025
9ee199b
ext/pdo: Add FETCH_INTO setting via setAttribute "hack"
Girgias Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ext/pdo/pdo_stmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
int flags, idx, old_arg_count = 0;
zend_class_entry *ce = NULL, *old_ce = NULL;
zval old_ctor_args = {{0}, {0}, {0}};
int i = 0;
int column_index_to_fetch = 0;
zval *fetch_function_params = NULL;
uint32_t fetch_function_param_num = 0;

Expand Down Expand Up @@ -785,7 +785,7 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
old_arg_count = stmt->fetch.cls.fci.param_count;
do_fetch_opt_finish(stmt, 0);

fetch_value(stmt, &val, i++, NULL);
fetch_value(stmt, &val, column_index_to_fetch++, NULL);
if (Z_TYPE(val) != IS_NULL) {
if (!try_convert_to_string(&val)) {
return 0;
Expand Down Expand Up @@ -865,15 +865,15 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
}

if (group_key) {
fetch_value(stmt, group_key, i, NULL);
fetch_value(stmt, group_key, column_index_to_fetch, NULL);
convert_to_string(group_key);
i++;
column_index_to_fetch++;
}

for (idx = 0; i < stmt->column_count; i++, idx++) {
for (idx = 0; column_index_to_fetch < stmt->column_count; column_index_to_fetch++, idx++) {
zval val;
fetch_value(stmt, &val, i, NULL);
zend_string *column_name = stmt->columns[i].name;
fetch_value(stmt, &val, column_index_to_fetch, NULL);
zend_string *column_name = stmt->columns[column_index_to_fetch].name;

switch (how) {
case PDO_FETCH_ASSOC:
Expand All @@ -883,7 +883,7 @@ static bool do_fetch(pdo_stmt_t *stmt, zval *return_value, enum pdo_fetch_type h
case PDO_FETCH_USE_DEFAULT:
case PDO_FETCH_BOTH:
zend_symtable_update(Z_ARRVAL_P(return_value), column_name, &val);
if (zend_hash_index_add(Z_ARRVAL_P(return_value), i, &val) != NULL) {
if (zend_hash_index_add(Z_ARRVAL_P(return_value), column_index_to_fetch, &val) != NULL) {
Z_TRY_ADDREF(val);
}
break;
Expand Down
11 changes: 11 additions & 0 deletions ext/pdo/tests/bug_38253.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ $stmt = $pdo->prepare ("SELECT * FROM test38253");
$stmt->execute();
var_dump($stmt->fetchAll());

$pdo->setAttribute (PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_INTO);
$stmt = $pdo->prepare ("SELECT * FROM test38253");
$stmt->execute();
var_dump($stmt->fetchAll());

?>
--CLEAN--
<?php
Expand All @@ -47,3 +52,9 @@ Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error: No fetch func
Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error%s on line %d
array(0) {
}

Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error: No fetch-into object specified. in %s on line %d

Warning: PDOStatement::fetchAll(): SQLSTATE[HY000]: General error%s on line %d
array(0) {
}
Loading