[pecl-database-pdo_oci] main: Fix cursor cleanup for non-query statements

From: Date: Thu, 29 Oct 2026 12:32:09 +0000
Subject: [pecl-database-pdo_oci] main: Fix cursor cleanup for non-query statements
Groups: php.pecl.cvs 
Request: Send a blank email to pecl-cvs+get-28712@lists.php.net to get a copy of this message
Author: Ilia Alshanetsky (iliaal) Date: 2026-10-23T08:00:43-04:00 Commit: https://github.com/php/pecl-database-pdo_oci/commit/59b154e0ab0011e92b5a3ebb3adb5670bbe5f6ec Raw diff: https://github.com/php/pecl-database-pdo_oci/commit/59b154e0ab0011e92b5a3ebb3adb5670bbe5f6ec.diff Fix cursor cleanup for non-query statements Register a cursor closer that cancels SELECT cursors with a zero-row fetch. PDO's fallback fetches from DML, DDL, and PL/SQL handles, which can make the next execute fail with ORA-01002 or ORA-03137. This affects explicit closeCursor() and automatic cleanup in PHP 8.4.27 and 8.5.12. Cover non-query re-execution with and without closeCursor(), and extend query coverage to partial fetches, changed binds, repeated closure, and scrollable cursors. Based on m3ct0n's suggestion and regression test. Changed paths: A tests/pdo_oci_reexecute_dml.phpt M oci_statement.c M package.xml M tests/pdo_oci_closecursor_reexecute.phpt Diff: diff --git a/oci_statement.c b/oci_statement.c index 47f8db2..1f15fad 100644 --- a/oci_statement.c +++ b/oci_statement.c @@ -1020,6 +1020,17 @@ static int oci_stmt_col_meta(pdo_stmt_t *stmt, zend_long colno, zval *return_val return SUCCESS; } /* }}} */ +static int oci_stmt_cursor_closer(pdo_stmt_t *stmt) +{ + pdo_oci_stmt *S = (pdo_oci_stmt*)stmt->driver_data; + + if (S && S->stmt && S->stmt_type == OCI_STMT_SELECT) { + OCIStmtFetch(S->stmt, S->err, 0, OCI_FETCH_NEXT, OCI_DEFAULT); + } + + return 1; +} + const struct pdo_stmt_methods oci_stmt_methods = { oci_stmt_dtor, oci_stmt_execute, @@ -1031,5 +1042,5 @@ const struct pdo_stmt_methods oci_stmt_methods = { NULL, /* get_attr */ oci_stmt_col_meta, NULL, - NULL + oci_stmt_cursor_closer }; diff --git a/package.xml b/package.xml index f9f88ff..8cbb451 100644 --- a/package.xml +++ b/package.xml @@ -108,6 +108,7 @@ Oracle&apos;s standard cross-version connectivity applies. For example, PHP PDO <file name="pdo_oci_fread_1.phpt" role="test" /> <file name="pdo_oci_phpinfo.phpt" role="test" /> <file name="pdo_oci_quote1.phpt" role="test" /> + <file name="pdo_oci_reexecute_dml.phpt" role="test" /> <file name="pdo_oci_stmt_getcolumnmeta.phpt" role="test" /> <file name="pdo_oci_stream_1.phpt" role="test" /> <file name="pdo_oci_stream_2.phpt" role="test" /> diff --git a/tests/pdo_oci_closecursor_reexecute.phpt b/tests/pdo_oci_closecursor_reexecute.phpt index e99efa8..2d81a02 100644 --- a/tests/pdo_oci_closecursor_reexecute.phpt +++ b/tests/pdo_oci_closecursor_reexecute.phpt @@ -29,6 +29,27 @@ $stmt->execute(); echo "after re-execute: "; var_dump($stmt->fetchAll(PDO::FETCH_NUM)); +$dbh->setAttribute(PDO::ATTR_PREFETCH, 0); +foreach (['forward' => PDO::CURSOR_FWDONLY, 'scrollable' => PDO::CURSOR_SCROLL] as $name => $cursor) { + echo "$name cursor:\n"; + $stmt = $dbh->prepare('SELECT :value FROM dual CONNECT BY LEVEL <= 2', [PDO::ATTR_CURSOR => $cursor]); + var_dump($stmt->closeCursor()); + $value = 'first'; + $stmt->bindParam(':value', $value); + $stmt->execute(); + echo $stmt->fetchColumn(), "\n"; + + $value = 'second'; + $stmt->execute(); + echo $stmt->fetchColumn(), "\n"; + var_dump($stmt->closeCursor()); + var_dump($stmt->closeCursor()); + + $value = 'third'; + $stmt->execute(); + echo implode(', ', $stmt->fetchAll(PDO::FETCH_COLUMN)), "\n"; +} + ?> --EXPECT-- first: array(1) { @@ -58,3 +79,17 @@ after re-execute: array(1) { string(1) "B" } } +forward cursor: +bool(true) +first +second +bool(true) +bool(true) +third, third +scrollable cursor: +bool(true) +first +second +bool(true) +bool(true) +third, third diff --git a/tests/pdo_oci_reexecute_dml.phpt b/tests/pdo_oci_reexecute_dml.phpt new file mode 100644 index 0000000..bfe086c --- /dev/null +++ b/tests/pdo_oci_reexecute_dml.phpt @@ -0,0 +1,68 @@ +--TEST-- +PDO_OCI: Re-executing non-query statements with and without closeCursor() +--EXTENSIONS-- +pdo +pdo_oci +--SKIPIF-- +<?php +require(getenv('PDO_TEST_DIR').'/pdo_test.inc'); +PDOTest::skip(); +?> +--FILE-- +<?php + +require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc'); + +$dbh = PDOTest::factory(); +$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); +$dbh->exec('CREATE TABLE test_reexecute_dml (id NUMBER PRIMARY KEY, name VARCHAR2(20))'); + +$insert = $dbh->prepare('INSERT INTO test_reexecute_dml (id, name) VALUES (:id, :name)'); +$insert->execute([':id' => 1, ':name' => 'a']); +$insert->execute([':id' => 2, ':name' => 'b']); +$insert->closeCursor(); +$insert->execute([':id' => 3, ':name' => 'c']); + +$update = $dbh->prepare('UPDATE test_reexecute_dml SET name = :name WHERE id = :id'); +$update->execute([':id' => 1, ':name' => 'a1']); +$update->execute([':id' => 2, ':name' => 'b1']); +$update->closeCursor(); +$update->execute([':id' => 2, ':name' => 'b2']); +var_dump($update->rowCount()); + +$alter = $dbh->prepare("ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD'"); +$alter->execute(); +$alter->execute(); +$alter->closeCursor(); +$alter->execute(); +echo "alter session: ok\n"; + +$block = $dbh->prepare('BEGIN :value := :value + 1; END;'); +$value = 0; +$block->bindParam(':value', $value, PDO::PARAM_INT | PDO::PARAM_INPUT_OUTPUT, 10); +$block->execute(); +$block->execute(); +$block->closeCursor(); +$block->execute(); +echo "PL/SQL: $value\n"; + +$select = $dbh->prepare('SELECT name FROM test_reexecute_dml WHERE id = :id'); +foreach ([1, 2, 3] as $id) { + $select->execute([':id' => $id]); + echo $select->fetchColumn(), "\n"; +} + +?> +--CLEAN-- +<?php +require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc'); +$dbh = PDOTest::factory(); +$dbh->exec('DROP TABLE test_reexecute_dml'); +?> +--EXPECT-- +int(1) +alter session: ok +PL/SQL: 3 +a1 +b2 +c

« previous php.pecl.cvs (#28712) next »