diff options
| author | Matteo Beccati <mbeccati@php.net> | 2016-08-04 09:30:48 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2016-08-04 09:30:48 +0200 |
| commit | 4003595d6000477e86db9c868375acb577f47131 (patch) | |
| tree | 24c80e79b799ff8aa146165aad761a91c84266e0 /ext/pdo_pgsql/pgsql_driver.c | |
| parent | 2b7a699acd3c064a39c1df8c7f7a0a5b66e07f0c (diff) | |
| parent | d3a8e107acb4f729016b6d649bc83a888359fb7d (diff) | |
| download | php-git-4003595d6000477e86db9c868375acb577f47131.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Clean up FR #72633
Diffstat (limited to 'ext/pdo_pgsql/pgsql_driver.c')
| -rw-r--r-- | ext/pdo_pgsql/pgsql_driver.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index 6bc1976161..df99912e4c 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -363,12 +363,13 @@ static char *pdo_pgsql_last_insert_id(pdo_dbh_t *dbh, const char *name, size_t * char *id = NULL; PGresult *res; 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()"); } else { + const char *q[1]; + q[0] = name; + res = PQexecParams(H->server, "SELECT CURRVAL($1)", 1, NULL, q, NULL, NULL, 0); } status = PQresultStatus(res); |