diff options
| author | Pablo Santiago Sánchez <phackwer@gmail.com> | 2016-07-27 22:12:56 -0300 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-08-02 14:34:30 +0200 |
| commit | 90c6cbd09baa8802cd0d92ad13d9d791a3e4025d (patch) | |
| tree | 9ef469fd8d4c2be918ababecd69c4b907b91e6f4 | |
| parent | c9d3ff0c6e86398b9471428ab49c6a6fa47ae977 (diff) | |
| download | php-git-90c6cbd09baa8802cd0d92ad13d9d791a3e4025d.tar.gz | |
- lastInsertId using Postgres Lastval() function
| -rw-r--r-- | ext/pdo_pgsql/pgsql_driver.c | 37 | ||||
| -rw-r--r-- | ext/pdo_pgsql/php_pdo_pgsql_int.h | 2 | ||||
| -rw-r--r-- | ext/pdo_pgsql/tests/bug_last_insert_id.phpt | 36 |
3 files changed, 56 insertions, 19 deletions
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index 8467552596..52a7768492 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -358,31 +358,30 @@ 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 (name == NULL) { - if (H->pgoid == InvalidOid) { - return NULL; - } - *len = spprintf(&id, 0, "%ld", (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, "%ld", (long) H->pgoid); + } - 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 eb645c58c4..2876b312b7 100644 --- a/ext/pdo_pgsql/php_pdo_pgsql_int.h +++ b/ext/pdo_pgsql/php_pdo_pgsql_int.h @@ -29,6 +29,8 @@ #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 new file mode 100644 index 0000000000..af5d342798 --- /dev/null +++ b/ext/pdo_pgsql/tests/bug_last_insert_id.phpt @@ -0,0 +1,36 @@ +--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 |