com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/pdo_pgs ql/pgsql_driver.c

From: Date: Sun, 14 Aug 2016 18:04:49 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/pdo_pgs ql/pgsql_driver.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93776@lists.php.net to get a copy of this message
Commit: 245eaf51875567f6e6b446a3fda3fac5502e77f7 Author: Anatol Belski <ab@php.net> Sun, 14 Aug 2016 20:04:49 +0200 Parents: 436d50a82192cbef4431fe9a70c641f49aec55a8 977cbc2fff1a3ec9d29a2c0904fae01bfd64c6c2 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=245eaf51875567f6e6b446a3fda3fac5502e77f7 Log: Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: Fixed bug #72759 Regression in pgo_pgsql Bugs: https://bugs.php.net/72759 Changed paths: MM ext/pdo_pgsql/pgsql_driver.c Diff: diff --cc ext/pdo_pgsql/pgsql_driver.c index df99912,b27753b..5a26b1d --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@@ -378,10 -382,17 +385,17 @@@ 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, "%ld", (long) H->pgoid); + *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); }

« previous php.cvs (#93776) next »