dprevot/php-sqlsrv
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix restoring PDO::ATTR_ERRMODE after PDO::lastInsertId() call failed (#1330)

Browse source
This commit is contained in:
mpyw 2021-11-19 01:14:55 +09:00 committed by GitHub
parent 3826f1a522
commit f52fb48335
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/pdo_sqlsrv/pdo_dbh.cpp
View file

@ -1598,6 +1598,9 @@ zend_string * pdo_sqlsrv_dbh_last_id(_Inout_ pdo_dbh_t *dbh, _In_ const zend_str
driver_stmt->~sqlsrv_stmt();
} catch( core::CoreException& ) {
// restore error handling to its previous mode
dbh->error_mode = prev_err_mode;
// copy any errors on the statement to the connection so that the user sees them, since the statement is released
// before this method returns
strcpy_s( dbh->error_code, sizeof( dbh->error_code ),

52
test/functional/pdo_sqlsrv/pdo_lastInsertId_restore_original_errmode_after_failed.phpt Normal file
View file

@ -0,0 +1,52 @@
--TEST--
Confirm that PDO::ATTR_ERRMODE value should be restored whether PDO::lastInsertId() call succeeded or not.
--SKIPIF--
<?php require('skipif_mid-refactor.inc'); ?>
--FILE--
<?php
require_once("MsCommon_mid-refactor.inc");
try {
$conn = connect();
// create temporary tables
createTable($conn, "table1", array(new columnMeta("int", "id", "IDENTITY(100,2)"), "val" => "int"));
createTable($conn, "table2", array(new columnMeta("int", "id", "IDENTITY(200,2)"), "val" => "int"));
createTable($conn, "table3", array("id" => "int", "val" => "int"));
insertRow($conn, "table1", array("val" => 1), "exec");
insertRow($conn, "table2", array("val" => 2), "exec");
$conn->lastInsertId();
var_dump($conn->getAttribute(PDO::ATTR_ERRMODE));
insertRow($conn, "table2", array("val" => 3), "exec");
insertRow($conn, "table1", array("val" => 4), "exec");
$conn->lastInsertId();
var_dump($conn->getAttribute(PDO::ATTR_ERRMODE));
// Should restore original value even if PDO::lastInsertId() failed.
insertRow($conn, "table3", array("id" => 1, "val" => 1), "exec");
$conn->lastInsertId();
var_dump($conn->getAttribute(PDO::ATTR_ERRMODE));
dropTable($conn, "table1");
dropTable($conn, "table2");
dropTable($conn, "table3");
// Should trigger exception
$tsql = "SELECT * FROM dummy";
$conn->exec($tsql);
unset($conn);
} catch (PDOException $e) {
print_r($e->getMessage());
exit;
}
?>
--EXPECTREGEX--
int\(2\)
int\(2\)
int\(2\)
.*Invalid object name \'dummy\'\.