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

cleaner code

Browse source
This commit is contained in:
v-kaywon 2017-03-29 13:45:57 -07:00
parent b9a2c093e4
commit 816856cbc0
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/shared/core_sqlsrv.h
View file

@ -2048,10 +2048,10 @@ namespace core {
// instead of throwing an exception, return 0 if the r=-1, stament has been executed, and has a HY010 error
// (HY010 error should not return if stmt->execute is true)
#ifndef _WIN32
sqlsrv_error_auto_ptr error;
if ( stmt->current_results != NULL ) {
if ( r == -1 && stmt->executed && stmt->current_results != NULL ) {
sqlsrv_error_auto_ptr error;
error = stmt->current_results->get_diag_rec( 1 );
if ( r == -1 && stmt->executed && strcmp( reinterpret_cast<const char*>( error->sqlstate ), "HY010" ) == 0 )
if ( strcmp( reinterpret_cast<const char*>( error->sqlstate ), "HY010" ) == 0 )
return 0;
}
#endif // !_WIN32

6
test/pdo_sqlsrv/pdo_336_pho_exec_empty_result_set_error.phpt
View file

@ -26,18 +26,18 @@ $Statement = $conn->exec("INSERT INTO foo_table (intField) VALUES(3)");
//test prepare, not args
$stmt = $conn->prepare($sql);
$stmt->execute();
if ($conn->errorCode() == 00000)
if ($conn->errorCode() == "00000")
echo "prepare OK\n";
//test prepare, with args
$stmt = $conn->prepare($sqlWithParameter);
$stmt->execute(array(':id' => $sqlParameter));
if ($conn->errorCode() == 00000)
if ($conn->errorCode() == "00000")
echo "prepare with args OK\n";
//test direct exec
$stmt = $conn->exec($sql);
if ($conn->errorCode() == 00000)
if ($conn->errorCode() == "00000")
echo "direct exec OK\n";
$Statement = $conn->exec("IF OBJECT_ID('foo_table', 'U') IS NOT NULL DROP TABLE foo_table");