Fixed #73959 - pgsql - lastInsertId fails to throw an exception for wrong sequence name

andrewnester · andrewnester · commit 02a6f2e6e36c · 2017-01-20T17:58:12.000+03:00
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
@@ -379,7 +379,6 @@ static char *pdo_pgsql_last_insert_id(pdo_dbh_t *dbh, const char *name, size_t *
 		*len = PQgetlength(res, 0, 0);
 	} else {
 		pdo_pgsql_error(dbh, status, pdo_pgsql_sqlstate(res));
-		*len = spprintf(&id, 0, ZEND_LONG_FMT, (zend_long) H->pgoid);
 	}
 
 	if (res) {
diff --git a/ext/pdo_pgsql/tests/bug73959.phpt b/ext/pdo_pgsql/tests/bug73959.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Bug #73959 (lastInsertId fails to throw an exception)
+--SKIPIF--
+<?php
+if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+require dirname(__FILE__) . '/config.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+require dirname(__FILE__) . '/config.inc';
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+$db->setAttribute(PDO::ATTR_PERSISTENT, false);
+$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+$db->setAttribute(PDO::PGSQL_ATTR_DISABLE_PREPARES, true);
+
+try {
+    $db->lastInsertId('nonexistent_seq');
+    echo "Error: No exception thrown";
+} catch (PDOException $e) {
+    echo "Success: Exception thrown";
+}
+?>
+--EXPECT--
+Success: Exception thrown

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,6 @@ static char pdo_pgsql_last_insert_id(pdo_dbh_t dbh, const char name, size_t `
`379`	`379`	`*len = PQgetlength(res, 0, 0);`
`380`	`380`	`} else {`
`381`	`381`	`pdo_pgsql_error(dbh, status, pdo_pgsql_sqlstate(res));`
`382`		`- *len = spprintf(&id, 0, ZEND_LONG_FMT, (zend_long) H->pgoid);`
`383`	`382`	`}`
`384`	`383`
`385`	`384`	`if (res) {`