com php-src: Merge branch 'PHP-7.0' into PHP-7.1: NEWS ext/pdo_pgsql/pgsql_driver.c

Commit: d6feb2edbdc95b2db1ec09f011595de0204b2fa1 Author: Joe Watkins <krakjoe@php.net> Fri, 20 Jan 2017 20:11:26 +0000 Parents: d6c9f91e2ef0e4278a17c0c242790f5f4433be3e 21ac79e94bd0335bf885b807e09c4d86d75d776a Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d6feb2edbdc95b2db1ec09f011595de0204b2fa1 Log: Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Fixed #73959 - lastInsertId fails to throw an exception in pdsql Bugs: https://bugs.php.net/73959 Changed paths: MM NEWS MM ext/pdo_pgsql/pgsql_driver.c Diff: diff --cc ext/pdo_pgsql/pgsql_driver.c index 045d32e,b04cade..52a9b8f --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@@ -378,10 -387,16 +378,9 @@@ static char *pdo_pgsql_last_insert_id(p id = estrdup((char *)PQgetvalue(res, 0, 0)); *len = PQgetlength(res, 0, 0); } else { - if (savepoint) { - (void)PQexec(H->server, "ROLLBACK TO SAVEPOINT _php_lastid_savepoint"); - } pdo_pgsql_error(dbh, status, pdo_pgsql_sqlstate(res)); - *len = spprintf(&id, 0, ZEND_LONG_FMT, (zend_long) H->pgoid); } - if (savepoint) { - (void)PQexec(H->server, "RELEASE SAVEPOINT _php_lastid_savepoint"); - } - if (res) { PQclear(res); }