com php-src: Revert "- lastInsertId using Postgres Lastval() function": ext/pdo_pgsql/pgsql_driver.c ext/pdo_pgsql/php_pdo _pgsql_int.h
ext/pdo_pgsql/tests/bug_last_insert _id.phpt

From: Date: Tue, 16 Aug 2016 22:58:15 +0000
Subject: com php-src: Revert "- lastInsertId using Postgres Lastval() function": ext/pdo_pgsql/pgsql_driver.c ext/pdo_pgsql/php_pdo _pgsql_int.h
ext/pdo_pgsql/tests/bug_last_insert _id.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93809@lists.php.net to get a copy of this message
Commit: 9caabe953a88b1ba71c16118504cf7265473e4e4 Author: Ferenc Kovacs <tyra3l@gmail.com> Wed, 17 Aug 2016 00:58:15 +0200 Parents: cf1f579fcd53b5f8f9e58c23a96d18bde7ee6d5d Branches: PHP-5.6.25 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9caabe953a88b1ba71c16118504cf7265473e4e4 Log: Revert "- lastInsertId using Postgres Lastval() function" This reverts commit 90c6cbd09baa8802cd0d92ad13d9d791a3e4025d. Changed paths: M ext/pdo_pgsql/pgsql_driver.c M ext/pdo_pgsql/php_pdo_pgsql_int.h D ext/pdo_pgsql/tests/bug_last_insert_id.phpt Diff: diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index 52a7768..8467552 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -358,30 +358,31 @@ static char *pdo_pgsql_last_insert_id(pdo_dbh_t *dbh, const char *name, unsigned { 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 (PHP_PDO_PGSQL_LASTVAL_PG_VERSION <= PQserverVersion(H->server) && name == NULL) { - res = PQexec(H->server, "SELECT LASTVAL()"); + if (name == NULL) { + if (H->pgoid == InvalidOid) { + return NULL; + } + *len = spprintf(&id, 0, "%ld", (long) H->pgoid); } 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)); - *len = spprintf(&id, 0, "%ld", (long) H->pgoid); - } + 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) { - PQclear(res); + if (res) { + PQclear(res); + } } - return id; } diff --git a/ext/pdo_pgsql/php_pdo_pgsql_int.h b/ext/pdo_pgsql/php_pdo_pgsql_int.h index 2876b31..eb645c5 100644 --- a/ext/pdo_pgsql/php_pdo_pgsql_int.h +++ b/ext/pdo_pgsql/php_pdo_pgsql_int.h @@ -29,8 +29,6 @@ #define PHP_PDO_PGSQL_CONNECTION_FAILURE_SQLSTATE "08006" -#define PHP_PDO_PGSQL_LASTVAL_PG_VERSION 80100 - typedef struct { const char *file; int line; diff --git a/ext/pdo_pgsql/tests/bug_last_insert_id.phpt b/ext/pdo_pgsql/tests/bug_last_insert_id.phpt deleted file mode 100644 index af5d342..0000000 --- a/ext/pdo_pgsql/tests/bug_last_insert_id.phpt +++ /dev/null @@ -1,36 +0,0 @@ ---TEST-- -currval() vs lastval() - PDO PgSQL Bug #1134 [BUG] New record, PostgreSQL and the Primary key https://github.com/phalcon/cphalcon/issues/1134 ---SKIPIF-- -<?php -if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded'); -require dirname(__FILE__) . '/config.inc'; -require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc'; -PDOTest::skip(); -?> ---FILE-- -<?php - -require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc'; - -$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); - -$db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false); - -@$db->query('CREATE TABLE test_last_id (id SERIAL NOT NULL, field1 VARCHAR(10))'); - -$stmt = $db->prepare("INSERT INTO test_last_id (field1) VALUES ('test')"); - -$stmt->execute(); - -/** - * No sequence name informed - */ -var_dump($db->lastInsertId()); -/** - * Sequence name informed - */ -var_dump($db->lastInsertId('test_last_id_id_seq')); -?> ---EXPECTREGEX-- -string\([0-9]*\)\ \"[0-9]*\" -string\([0-9]*\)\ \"[0-9]*\" \ No newline at end of file

« previous php.cvs (#93809) next »