diff options
| author | root <phackwer@gmail.com> | 2016-07-19 15:28:25 -0400 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-07-27 23:00:12 +0200 |
| commit | 12628e9a46b91a0aa92fd0619cdd545c409d25a6 (patch) | |
| tree | a3b7b93e02eedbdd0ef7987867bf18b4c1cb0b5d /ext/pdo_pgsql/pgsql_driver.c | |
| parent | c52322707e4224a5b3c16d53e9b59512d3a188e9 (diff) | |
| download | php-git-12628e9a46b91a0aa92fd0619cdd545c409d25a6.tar.gz | |
Implemented FR #72633 Postgres PDO lastInsertId() should work without specifying a sequence
Diffstat (limited to 'ext/pdo_pgsql/pgsql_driver.c')
| -rw-r--r-- | ext/pdo_pgsql/pgsql_driver.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index 3f92525506..6bc1976161 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -361,31 +361,30 @@ static char *pdo_pgsql_last_insert_id(pdo_dbh_t *dbh, const char *name, size_t * { pdo_pgsql_db_handle *H = (pdo_pgsql_db_handle *)dbh->driver_data; char *id = NULL; + PGresult *res; + ExecStatusType status; + const char *q[1]; + q[0] = name; - if (name == NULL) { - if (H->pgoid == InvalidOid) { - return NULL; - } - *len = spprintf(&id, 0, ZEND_LONG_FMT, (zend_long) H->pgoid); + if (PHP_PDO_PGSQL_LASTVAL_PG_VERSION <= PQserverVersion(H->server) && name == NULL) { + res = PQexec(H->server, "SELECT LASTVAL()"); } else { - PGresult *res; - ExecStatusType status; - const char *q[1]; - q[0] = name; res = PQexecParams(H->server, "SELECT CURRVAL($1)", 1, NULL, q, NULL, NULL, 0); - status = PQresultStatus(res); + } + status = PQresultStatus(res); - if (res && (status == PGRES_TUPLES_OK)) { - id = estrdup((char *)PQgetvalue(res, 0, 0)); - *len = PQgetlength(res, 0, 0); - } else { - pdo_pgsql_error(dbh, status, pdo_pgsql_sqlstate(res)); - } + if (res && (status == PGRES_TUPLES_OK)) { + id = estrdup((char *)PQgetvalue(res, 0, 0)); + *len = PQgetlength(res, 0, 0); + } else { + pdo_pgsql_error(dbh, status, pdo_pgsql_sqlstate(res)); + *len = spprintf(&id, 0, ZEND_LONG_FMT, (zend_long) H->pgoid); + } - if (res) { - PQclear(res); - } + if (res) { + PQclear(res); } + return id; } |