mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
commit
4003595d60
2
NEWS
2
NEWS
@ -96,7 +96,7 @@ PHP NEWS
|
|||||||
- PDO_pgsql:
|
- PDO_pgsql:
|
||||||
. Fixed bug #70313 (PDO statement fails to throw exception). (Matteo)
|
. Fixed bug #70313 (PDO statement fails to throw exception). (Matteo)
|
||||||
. Implemented FR #72633 (Postgres PDO lastInsertId() should work without
|
. Implemented FR #72633 (Postgres PDO lastInsertId() should work without
|
||||||
specifying a sequence). (Pablo Santiago Sánchez)
|
specifying a sequence). (Pablo Santiago Sánchez, Matteo)
|
||||||
|
|
||||||
- Reflection:
|
- Reflection:
|
||||||
. Fixed bug #72222 (ReflectionClass::export doesn't handle array constants).
|
. Fixed bug #72222 (ReflectionClass::export doesn't handle array constants).
|
||||||
|
@ -363,12 +363,13 @@ static char *pdo_pgsql_last_insert_id(pdo_dbh_t *dbh, const char *name, size_t *
|
|||||||
char *id = NULL;
|
char *id = NULL;
|
||||||
PGresult *res;
|
PGresult *res;
|
||||||
ExecStatusType status;
|
ExecStatusType status;
|
||||||
const char *q[1];
|
|
||||||
q[0] = name;
|
|
||||||
|
|
||||||
if (PHP_PDO_PGSQL_LASTVAL_PG_VERSION <= PQserverVersion(H->server) && name == NULL) {
|
if (name == NULL) {
|
||||||
res = PQexec(H->server, "SELECT LASTVAL()");
|
res = PQexec(H->server, "SELECT LASTVAL()");
|
||||||
} else {
|
} else {
|
||||||
|
const char *q[1];
|
||||||
|
q[0] = name;
|
||||||
|
|
||||||
res = PQexecParams(H->server, "SELECT CURRVAL($1)", 1, NULL, q, NULL, NULL, 0);
|
res = PQexecParams(H->server, "SELECT CURRVAL($1)", 1, NULL, q, NULL, NULL, 0);
|
||||||
}
|
}
|
||||||
status = PQresultStatus(res);
|
status = PQresultStatus(res);
|
||||||
|
@ -29,8 +29,6 @@
|
|||||||
|
|
||||||
#define PHP_PDO_PGSQL_CONNECTION_FAILURE_SQLSTATE "08006"
|
#define PHP_PDO_PGSQL_CONNECTION_FAILURE_SQLSTATE "08006"
|
||||||
|
|
||||||
#define PHP_PDO_PGSQL_LASTVAL_PG_VERSION 80100
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
const char *file;
|
const char *file;
|
||||||
int line;
|
int line;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--TEST--
|
--TEST--
|
||||||
currval() vs lastval() - PDO PgSQL Bug #1134 [BUG] New record, PostgreSQL and the Primary key https://github.com/phalcon/cphalcon/issues/1134
|
PDO PgSQL Bug #72633 (Postgres PDO lastInsertId() should work without specifying a sequence)
|
||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php
|
<?php
|
||||||
if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
|
if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
|
Loading…
Reference in New Issue
Block a user