com php-src: Clean up FR #72633: NEWS ext/pdo_pgsql/pgsql_d river.c ext/pdo_pgsql/php_pdo_pgsql_int.h ext/p do_pgsql/tests/bug72633.phpt
ext/pdo_pgsql/te sts/bug_last_insert_id.phpt

From: Date: Thu, 04 Aug 2016 07:28:58 +0000
Subject: com php-src: Clean up FR #72633: NEWS ext/pdo_pgsql/pgsql_d river.c ext/pdo_pgsql/php_pdo_pgsql_int.h ext/p do_pgsql/tests/bug72633.phpt
ext/pdo_pgsql/te sts/bug_last_insert_id.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-93608@lists.php.net to get a copy of this message
Commit: d3a8e107acb4f729016b6d649bc83a888359fb7d Author: Matteo Beccati <mbeccati@php.net> Thu, 4 Aug 2016 09:28:58 +0200 Parents: 78488a54c8f23c16bf0ca044c50c0fac8e303400 Branches: PHP-5.6 PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d3a8e107acb4f729016b6d649bc83a888359fb7d Log: Clean up FR #72633 Bugs: https://bugs.php.net/72633 Changed paths: M NEWS M ext/pdo_pgsql/pgsql_driver.c M ext/pdo_pgsql/php_pdo_pgsql_int.h A ext/pdo_pgsql/tests/bug72633.phpt D ext/pdo_pgsql/tests/bug_last_insert_id.phpt Diff: diff --git a/NEWS b/NEWS index 51d59f4..21427cc 100644 --- a/NEWS +++ b/NEWS @@ -72,7 +72,7 @@ PHP NEWS - PDO_pgsql: . Fixed bug #70313 (PDO statement fails to throw exception).. (Matteo) . Implemented FR #72633 (Postgres PDO lastInsertId() should work without - specifying a sequence). (Pablo Santiago Sánchez) + specifying a sequence). (Pablo Santiago Sánchez, Matteo) - Reflection: . Fixed bug #72222 (ReflectionClass::export doesn't handle array constants). diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index 52a7768..5b78bcc 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -360,12 +360,13 @@ static char *pdo_pgsql_last_insert_id(pdo_dbh_t *dbh, const char *name, unsigned 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) { + if (name == NULL) { res = PQexec(H->server, "SELECT LASTVAL()"); } else { + const char *q[1]; + q[0] = name; + res = PQexecParams(H->server, "SELECT CURRVAL($1)", 1, NULL, q, NULL, NULL, 0); } status = PQresultStatus(res); 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/bug72633.phpt b/ext/pdo_pgsql/tests/bug72633.phpt new file mode 100644 index 0000000..06bd25e --- /dev/null +++ b/ext/pdo_pgsql/tests/bug72633.phpt @@ -0,0 +1,39 @@ +--TEST-- +PDO PgSQL Bug #72633 (Postgres PDO lastInsertId() should work without specifying a sequence) +--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')); + +$db->query('DROP TABLE test_last_id'); + +?> +--EXPECTREGEX-- +string\([0-9]*\)\ \"[0-9]*\" +string\([0-9]*\)\ \"[0-9]*\" 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 30dd0f0..0000000 --- a/ext/pdo_pgsql/tests/bug_last_insert_id.phpt +++ /dev/null @@ -1,39 +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')); - -$db->query('DROP TABLE test_last_id'); - -?> ---EXPECTREGEX-- -string\([0-9]*\)\ \"[0-9]*\" -string\([0-9]*\)\ \"[0-9]*\"

« previous php.cvs (#93608) next »