Fix #1599: Remove SQLCancel from core_sqlsrv_next_result for user-facing APIs

When SQLMoreResults returns SQL_ERROR for a mid-batch statement failure
(e.g. divide-by-zero with XACT_ABORT OFF), the ODBC spec says it should
return SQL_SUCCESS_WITH_INFO when the batch is not aborted and the failed
statement is not the last one.  The Microsoft ODBC driver incorrectly
returns SQL_ERROR, but the statement handle remains valid.  The old code
called SQLCancel() in the catch block, which aborted the entire remaining
batch, making subsequent result sets unreachable.

This change adds a throw_on_errors parameter (default true) to
core_sqlsrv_next_result:

- throw_on_errors=true (default): used by internal flush loops
  (closeCursor, re-execute, param binding).  Uses the throwing
  core::SQLMoreResults wrapper and calls SQLCancel in the catch block.
  Same behavior as before.

- throw_on_errors=false: used only by sqlsrv_next_result() and
  PDO::nextRowset().  Calls SQLMoreResults directly, reports the error
  through the normal error handler, clears any pending PDO exception,
  and falls through to new_result_set().  The batch remains navigable.
  SQLCancel is NOT called in the catch block for this path.

Tests cover both extensions (ERRMODE_WARNING and ERRMODE_EXCEPTION for
PDO), re-execute after a batch error (flush loop), and error visibility
via sqlsrv_errors() / errorInfo().

Fixes #1599

Author: jahnvi480

source/shared/core_stmt.cpp

@@ -1035,11 +1035,15 @@ void core_sqlsrv_next_result( _Inout_ sqlsrv_stmt* stmt, _In_ bool finalize_outp
     }
     catch( core::CoreException& e ) {
 
-        // Do not call SQLCancel here.  When SQLMoreResults returns SQL_ERROR
-        // for a mid-batch statement failure (e.g. divide-by-zero with
-        // XACT_ABORT OFF), the statement handle is still valid and the user
-        // should be able to call next_result again to reach subsequent result
-        // sets.  Calling SQLCancel would abort the entire remaining batch.
+        // For internal callers (throw_on_errors=true — flush loops,
+        // closeCursor, param binding) we still call SQLCancel to clean up
+        // the ODBC handle on error.  For user-facing callers
+        // (throw_on_errors=false — sqlsrv_next_result / PDO::nextRowset)
+        // we must NOT cancel because the handle is still valid and the
+        // batch remains navigable after a mid-batch statement failure.
+        if( throw_on_errors ) {
+            SQLCancel( stmt->handle() );
+        }
         throw e;
     }
 }

source/sqlsrv/stmt.cpp

@@ -294,7 +294,7 @@ PHP_FUNCTION( sqlsrv_execute )
             // to prepare to execute the next statement, we skip any remaining results (and skip parameter finalization too)
             while( stmt->past_next_result_end == false ) {
 
-                core_sqlsrv_next_result( stmt, false, false );
+                core_sqlsrv_next_result( stmt, false );
             }
         }
 

test/functional/pdo_sqlsrv/PDO_ConnPool_Unix.phpt

@@ -13,6 +13,10 @@ if (extension_loaded('pdo_odbc')) {
 ?>
 --FILE--
 <?php
+// Prevent 'sh: warning: setlocale: LC_ALL: cannot change locale' on systems
+// where en_US.UTF-8 is not installed (e.g., Red Hat containers)
+putenv('LC_ALL=C');
+
 function findODBCDriver($content, $lines_to_add)
 {
     require_once('MsSetup.inc');
@@ -25,8 +29,29 @@ function findODBCDriver($content, $lines_to_add)
 $lines_to_add="CPTimeout=5\n[ODBC]\nPooling=Yes\n";
 
 //get default odbcinst.ini location
-$lines = explode("\n", shell_exec("odbcinst -j"));
-$odbcinst_ini = explode(" ", $lines[1])[1];
+$output = shell_exec("odbcinst -j 2>/dev/null");
+$odbcinst_ini = '';
+if ($output) {
+    foreach (explode("\n", $output) as $line) {
+        if (stripos($line, 'DRIVERS') !== false) {
+            // Handle both "DRIVERS: /path" and "DRIVERS............: /path" formats
+            $parts = explode(":", $line, 2);
+            $path = trim($parts[1] ?? '');
+            if ($path && file_exists($path)) {
+                $odbcinst_ini = $path;
+                break;
+            }
+        }
+    }
+}
+// Fallback to well-known default path
+if (empty($odbcinst_ini) || !file_exists($odbcinst_ini)) {
+    if (file_exists('/etc/odbcinst.ini')) {
+        $odbcinst_ini = '/etc/odbcinst.ini';
+    } else {
+        die("Could not determine odbcinst.ini location");
+    }
+}
 $custom_odbcinst_ini = dirname(__FILE__)."/odbcinst.ini";
 
 //copy the default odbcinst.ini into the current folder

test/functional/pdo_sqlsrv/pdo_connect_encrypt_attributes.phpt

@@ -5,11 +5,18 @@ This test does not test if any connection is successful but mainly test if the E
 different attributes.
 --SKIPIF--
 <?php require('skipif_mid-refactor.inc');
-$conn = connect();
-$stmt = $conn->query("SELECT SERVERPROPERTY('Edition') AS Edition");
-$row = $stmt->fetch(PDO::FETCH_ASSOC);
-if ($row && strpos($row['Edition'], 'Express') !== false) {
-    die("skip LocalDB/Express Edition doesn't support Force Encryption");
+try {
+    $conn = connect();
+    if (!$conn) {
+        die("skip Could not connect");
+    }
+    $stmt = $conn->query("SELECT SERVERPROPERTY('Edition') AS Edition");
+    $row = $stmt->fetch(PDO::FETCH_ASSOC);
+    if ($row && strpos($row['Edition'], 'Express') !== false) {
+        die("skip LocalDB/Express Edition doesn't support Force Encryption");
+    }
+} catch (Exception $e) {
+    die("skip " . $e->getMessage());
 }
 ?>
 --FILE--

test/functional/pdo_sqlsrv/skipif_azure_ad_acess_token.inc

@@ -12,8 +12,12 @@ require_once("MsSetup.inc");
 require_once("MsCommon_mid-refactor.inc");
 
 // MsCommon_mid-refactor.inc connect() signature: connect($keywords = '', $options=array(), $errmode, $disableCE)
-$conn = connect();
-if ($conn === false) {
+try {
+    $conn = connect();
+} catch (Exception $e) {
+    $conn = false;
+}
+if (!$conn) {
     die("skip Could not connect during SKIPIF.");
 }
 

test/functional/sqlsrv/sqlsrv_ConnPool_Unix.phpt

@@ -7,6 +7,10 @@ This test assumes the default odbcinst.ini has not been modified.
 <?php if (extension_loaded('pdo_odbc')) die('skip pdo_odbc extension forces ODBC pooling, interfering with this test'); ?>
 --FILE--
 <?php
+// Prevent 'sh: warning: setlocale: LC_ALL: cannot change locale' on systems
+// where en_US.UTF-8 is not installed (e.g., Red Hat containers)
+putenv('LC_ALL=C');
+
 function findODBCDriver($content, $lines_to_add)
 {
     require_once('MsSetup.inc');
@@ -19,8 +23,29 @@ function findODBCDriver($content, $lines_to_add)
 $lines_to_add="CPTimeout=5\n[ODBC]\nPooling=Yes\n";
 
 //get default odbcinst.ini location
-$lines = explode("\n", shell_exec("odbcinst -j"));
-$odbcinst_ini = explode(" ", $lines[1])[1];
+$output = shell_exec("odbcinst -j 2>/dev/null");
+$odbcinst_ini = '';
+if ($output) {
+    foreach (explode("\n", $output) as $line) {
+        if (stripos($line, 'DRIVERS') !== false) {
+            // Handle both "DRIVERS: /path" and "DRIVERS............: /path" formats
+            $parts = explode(":", $line, 2);
+            $path = trim($parts[1] ?? '');
+            if ($path && file_exists($path)) {
+                $odbcinst_ini = $path;
+                break;
+            }
+        }
+    }
+}
+// Fallback to well-known default path
+if (empty($odbcinst_ini) || !file_exists($odbcinst_ini)) {
+    if (file_exists('/etc/odbcinst.ini')) {
+        $odbcinst_ini = '/etc/odbcinst.ini';
+    } else {
+        die("Could not determine odbcinst.ini location");
+    }
+}
 $custom_odbcinst_ini = dirname(__FILE__)."/odbcinst.ini";
 
 //copy the default odbcinst.ini into the current folder
@@ -34,15 +59,15 @@ file_put_contents($custom_odbcinst_ini, $new_content);
 //Creating a new php process, because for changes in odbcinst.ini file to affect pooling, drivers must be reloaded.
 //Also setting the odbcini path to the current folder for the same process.
 //This will let us modify odbcinst.ini without root permissions
-print_r(shell_exec("export ODBCSYSINI=".dirname(__FILE__)."&&".PHP_BINARY." ".dirname(__FILE__)."/isPooled.php"));
+print_r(shell_exec("export ODBCSYSINI=".dirname(__FILE__)." && ".PHP_BINARY." ".dirname(__FILE__)."/isPooled.php 2>/dev/null"));
 
 
 //disable pooling by modifying the odbcinst.ini file
 $current = file_get_contents($custom_odbcinst_ini);
 $current = str_replace($lines_to_add,'',$current);
 file_put_contents($custom_odbcinst_ini, $current);
 
-print_r(shell_exec("export ODBCSYSINI=".dirname(__FILE__)."&&".PHP_BINARY." ".dirname(__FILE__)."/isPooled.php"));
+print_r(shell_exec("export ODBCSYSINI=".dirname(__FILE__)." && ".PHP_BINARY." ".dirname(__FILE__)."/isPooled.php 2>/dev/null"));
 ?>
 --CLEAN--
 <?php

test/functional/sqlsrv/sqlsrv_ae_datetimes_as_strings.phpt

@@ -544,7 +544,7 @@ for ($i=0; $i<$SZ_DATE_all; $i++)
     }
 }
 
-date_default_timezone_set('Canada/Pacific');
+date_default_timezone_set('America/Vancouver');
 sqlsrv_configure('WarningsReturnAsErrors', 1);
 sqlsrv_configure('LogSeverity', SQLSRV_LOG_SEVERITY_ALL);
 sqlsrv_configure('LogSubsystems', SQLSRV_LOG_SYSTEM_OFF);

test/functional/sqlsrv/sqlsrv_ae_insert_datetime.phpt

@@ -9,7 +9,7 @@ Bind params using sqlsrv_prepare without any sql_type specified
 require_once('MsCommon.inc');
 require_once('AEData.inc');
 
-date_default_timezone_set("Canada/Pacific");
+date_default_timezone_set("America/Vancouver");
 $dataTypes = array( "date", "datetime", "datetime2", "smalldatetime", "time", "datetimeoffset" );
 $conn = AE\connect();
 
@@ -53,23 +53,23 @@ sqlsrv_close($conn);
 
 Testing date: 
 ****Encrypted default type is compatible with encrypted date****
-c_det: 0001-01-01 00:00:00.000000 Canada/Pacific
-c_rand: 9999-12-31 00:00:00.000000 Canada/Pacific
+c_det: 0001-01-01 00:00:00.000000 America/Vancouver
+c_rand: 9999-12-31 00:00:00.000000 America/Vancouver
 
 Testing datetime: 
 ****Encrypted default type is compatible with encrypted datetime****
-c_det: 1753-01-01 00:00:00.000000 Canada/Pacific
-c_rand: 9999-12-31 23:59:59.997000 Canada/Pacific
+c_det: 1753-01-01 00:00:00.000000 America/Vancouver
+c_rand: 9999-12-31 23:59:59.997000 America/Vancouver
 
 Testing datetime2: 
 ****Encrypted default type is compatible with encrypted datetime2****
-c_det: 0001-01-01 00:00:00.000000 Canada/Pacific
-c_rand: 9999-12-31 23:59:59.123456 Canada/Pacific
+c_det: 0001-01-01 00:00:00.000000 America/Vancouver
+c_rand: 9999-12-31 23:59:59.123456 America/Vancouver
 
 Testing smalldatetime: 
 ****Encrypted default type is compatible with encrypted smalldatetime****
-c_det: 1900-01-01 00:00:00.000000 Canada/Pacific
-c_rand: 2079-06-05 23:59:00.000000 Canada/Pacific
+c_det: 1900-01-01 00:00:00.000000 America/Vancouver
+c_rand: 2079-06-05 23:59:00.000000 America/Vancouver
 
 Testing time: 
 ****Encrypted default type is compatible with encrypted time****

test/functional/sqlsrv/sqlsrv_ae_insert_retrieve.phpt

@@ -8,7 +8,7 @@ Retrieving SQL query contains encrypted filter
 <?php
 require_once('MsCommon.inc');
 
-date_default_timezone_set("Canada/Pacific");
+date_default_timezone_set("America/Vancouver");
 $conn = AE\connect();
 
 // Create the table
@@ -73,7 +73,7 @@ Retrieving plaintext data:
 SSN: 795-73-9838
 FirstName: Catherine
 LastName: Abel
-BirthDate: 1996-10-19 00:00:00.000000 Canada/Pacific
+BirthDate: 1996-10-19 00:00:00.000000 America/Vancouver
 
 Checking ciphertext data:
 Done

test/functional/sqlsrv/sqlsrv_ae_insert_retrieve_fixed_size.phpt

@@ -6,7 +6,7 @@ Test for inserting encrypted fixed size types data and retrieve both encrypted a
 <?php
 require_once('MsCommon.inc');
 
-date_default_timezone_set("Canada/Pacific");
+date_default_timezone_set("America/Vancouver");
 $conn = AE\connect();
 $testPass = true;
 
@@ -88,6 +88,6 @@ IntData: 2147483647
 BigIntData: 92233720368547
 DecimalData: 79228162514264
 BitData: 1
-DateTimeData: 9999-12-31 23:59:59.997000 Canada/Pacific
-DateTime2Data: 9999-12-31 23:59:59.123456 Canada/Pacific
+DateTimeData: 9999-12-31 23:59:59.997000 America/Vancouver
+DateTime2Data: 9999-12-31 23:59:59.123456 America/Vancouver
 Done