archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Fixed bug #48188

Browse source
This commit is contained in:
Matteo Beccati 2009-05-12 22:17:50 +00:00
parent 92288eca5c
commit 82151d4dc3
3 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/pdo_pgsql/pgsql_statement.c
View file

@ -131,6 +131,13 @@ static int pgsql_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC)
if (S->cursor_name) { if (S->cursor_name) {
char *q = NULL; char *q = NULL;
if (S->is_prepared) {
spprintf(&q, 0, "CLOSE %s", S->cursor_name);
S->result = PQexec(H->server, q);
efree(q);
}
spprintf(&q, 0, "DECLARE %s SCROLL CURSOR WITH HOLD FOR %s", S->cursor_name, stmt->active_query_string); spprintf(&q, 0, "DECLARE %s SCROLL CURSOR WITH HOLD FOR %s", S->cursor_name, stmt->active_query_string);
S->result = PQexec(H->server, q); S->result = PQexec(H->server, q);
efree(q); efree(q);
@ -142,6 +149,9 @@ static int pgsql_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC)
return 0; return 0;
} }
/* the cursor was declared correctly */
S->is_prepared = 1;
/* fetch to be able to get the number of tuples later, but don't advance the cursor pointer */ /* fetch to be able to get the number of tuples later, but don't advance the cursor pointer */
spprintf(&q, 0, "FETCH FORWARD 0 FROM %s", S->cursor_name); spprintf(&q, 0, "FETCH FORWARD 0 FROM %s", S->cursor_name);
S->result = PQexec(H->server, q); S->result = PQexec(H->server, q);

2
ext/pdo_pgsql/php_pdo_pgsql_int.h
View file

@ -65,8 +65,8 @@ typedef struct {
int *param_lengths; int *param_lengths;
int *param_formats; int *param_formats;
Oid *param_types; Oid *param_types;
zend_bool is_prepared;
#endif #endif
zend_bool is_prepared;
} pdo_pgsql_stmt; } pdo_pgsql_stmt;
typedef struct { typedef struct {

8
ext/pdo_pgsql/tests/bug44861.phpt
View file

@ -38,6 +38,12 @@ $res = $dbh->prepare("SELECT ?", $aParams);
$res->execute(array("it's working")); $res->execute(array("it's working"));
var_dump($res->fetch(PDO::FETCH_NUM)); var_dump($res->fetch(PDO::FETCH_NUM));
// Test bug #48188, trying to execute again
$res->execute(array("try again"));
var_dump($res->fetchColumn());
var_dump($res->fetchColumn());
?> ?>
--EXPECT-- --EXPECT--
string(4) "row1" string(4) "row1"
@ -76,3 +82,5 @@ array(1) {
[0]=> [0]=>
string(12) "it's working" string(12) "it's working"
} }
string(9) "try again"
bool(false)