removed the hardcoded values for ODBC versions

2017-09-13 14:45:11 -07:00 · 2017-09-13 14:45:11 -07:00 · 0d4e6373a0
parent 964ec5f087
commit 0d4e6373a0
25 changed files with 114 additions and 114 deletions
--- a/test/functional/pdo_sqlsrv/pdo_040_error_information.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_040_error_information.phpt
@ -31,11 +31,11 @@ $conn = null;
 print "Done";
 ?>

--EXPECT--
+--EXPECTREGEX--
 Array
-(
-    [0] => 21S01
-    [1] => 213
-    [2] => [Microsoft][ODBC Driver 13 for SQL Server][SQL Server]Column name or number of supplied values does not match table definition.
-)
+\(
+    \[0\] => 21S01
+    \[1\] => 213
+    \[2\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Column name or number of supplied values does not match table definition\.
+\)
 Done
--- a/test/functional/pdo_sqlsrv/pdo_connect_encrypted.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_connect_encrypted.phpt
@ -62,8 +62,8 @@ Test new connection keyword ColumnEncryption
 --EXPECTREGEX--
 Connected successfully with ColumnEncryption enabled.
 Failed to connect.
-SQLSTATE\[08001\]: .*\[Microsoft\]\[ODBC Driver 13 for SQL Server\]Invalid value specified for connection string attribute 'ColumnEncryption'
+SQLSTATE\[08001\]: .*\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Invalid value specified for connection string attribute 'ColumnEncryption'
 Failed to connect.
-SQLSTATE\[08001\]: .*\[Microsoft\]\[ODBC Driver 13 for SQL Server\]Invalid value specified for connection string attribute 'ColumnEncryption'
+SQLSTATE\[08001\]: .*\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Invalid value specified for connection string attribute 'ColumnEncryption'
 Connected successfully with ColumnEncryption disabled.
 Done
--- a/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_errors.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_connect_encrypted_ksp_errors.phpt
@ -71,29 +71,29 @@ Connect using a custom keystore provider with some required inputs missing

    echo "Done\n";
 ?>
--EXPECT--
+--EXPECTREGEX--
 Connecting... with column encryption
 Connected successfully with ColumnEncryption enabled and KSP specified.

 Connecting... with an invalid input to CEKeystoreProvider
 Failed to connect.
-SQLSTATE[HY024]: [Microsoft][ODBC Driver 13 for SQL Server]Invalid attribute value
+SQLSTATE\[HY024\]: \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Invalid attribute value

 Connecting... with an empty path
 Failed to connect.
-SQLSTATE[IMSSP]: Invalid value for loading a custom keystore provider.
+SQLSTATE\[IMSSP\]: Invalid value for loading a custom keystore provider.

 Connecting... without a path
 Failed to connect.
-SQLSTATE[IMSSP]: The path to the custom keystore provider is missing.
+SQLSTATE\[IMSSP\]: The path to the custom keystore provider is missing.

 Connecting... without a name
 Failed to connect.
-SQLSTATE[IMSSP]: The name of the custom keystore provider is missing.
+SQLSTATE\[IMSSP\]: The name of the custom keystore provider is missing.

 Connecting... without a key
 Failed to connect.
-SQLSTATE[IMSSP]: The encryption key for the custom keystore provider is missing.
+SQLSTATE\[IMSSP\]: The encryption key for the custom keystore provider is missing.

 Connecting... with all required inputs
 Connected successfully with ColumnEncryption enabled and KSP specified.
--- a/test/functional/pdo_sqlsrv/pdo_error.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_error.phpt
@ -29,5 +29,5 @@ Array
 \(
    \[0\] => 42S22
    \[1\] => 207
-    \[2\] => \[Microsoft\]\[ODBC Driver (09|10|11|12|13) for SQL Server\]\[SQL Server\]Invalid column name 'IntColX'\.
+    \[2\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Invalid column name 'IntColX'\.
 \)
--- a/test/functional/pdo_sqlsrv/pdo_errorinfo_emulateprepare.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_errorinfo_emulateprepare.phpt
@ -91,13 +91,13 @@ conn native code and native message are NULL\.

 Warning: PDOStatement::bindParam\(\): SQLSTATE\[HY093\]: Invalid parameter number: parameter was not defined in .+(\/|\\)pdo_errorinfo_emulateprepare\.php on line [0-9]+

-Warning: PDOStatement::execute\(\): SQLSTATE\[07002\]: COUNT field incorrect: 0 \[Microsoft\]\[ODBC Driver 1[0-9] for SQL Server\]COUNT field incorrect or syntax error in .+(\/|\\)pdo_errorinfo_emulateprepare\.php on line [0-9]+
+Warning: PDOStatement::execute\(\): SQLSTATE\[07002\]: COUNT field incorrect: 0 \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]COUNT field incorrect or syntax error in .+(\/|\\)pdo_errorinfo_emulateprepare\.php on line [0-9]+
 Statement error info:
 Array
 \(
    \[0\] => 07002
    \[1\] => 0
-    \[2\] => \[Microsoft\]\[ODBC Driver 1[0-9] for SQL Server\]COUNT field incorrect or syntax error
+    \[2\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]COUNT field incorrect or syntax error
 \)
 Connection error info:
 Array
--- a/test/functional/pdo_sqlsrv/pdo_param_output_select_variant.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_param_output_select_variant.phpt
@ -77,9 +77,9 @@ function RunTest()
 RunTest();

 ?>
--EXPECT--
+--EXPECTREGEX--

 Number of rows: 1
-SQLSTATE[42000]: [Microsoft][ODBC Driver 13 for SQL Server][SQL Server]Implicit conversion from data type sql_variant to nvarchar(max) is not allowed. Use the CONVERT function to run this query.
+SQLSTATE\[42000\]: \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Implicit conversion from data type sql_variant to nvarchar\(max\) is not allowed. Use the CONVERT function to run this query.
 Done
-Test "pdo_param_output_select_variant" completed successfully.
+Test \"pdo_param_output_select_variant\" completed successfully\.
--- a/test/functional/pdo_sqlsrv/pdo_param_output_variants.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_param_output_variants.phpt
@ -131,10 +131,10 @@ function RunTest()
 RunTest();

 ?>
--EXPECT--
+--EXPECTREGEX--

-SQLSTATE[22018]: [Microsoft][ODBC Driver 13 for SQL Server][SQL Server]Operand type clash: nvarchar(max) is incompatible with sql_variant
-SQLSTATE[22018]: [Microsoft][ODBC Driver 13 for SQL Server][SQL Server]Operand type clash: nvarchar(max) is incompatible with sql_variant
+SQLSTATE\[22018\]: \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Operand type clash: nvarchar\(max\) is incompatible with sql_variant
+SQLSTATE\[22018\]: \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Operand type clash: nvarchar\(max\) is incompatible with sql_variant

 Done
-Test "pdo_param_output_variants" completed successfully.
+Test \"pdo_param_output_variants\" completed successfully\.
--- a/test/functional/pdo_sqlsrv/pdo_prepare_emulatePrepare_binary.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_prepare_emulatePrepare_binary.phpt
@ -79,7 +79,7 @@ Array
 \)
 Prepare with emulate prepare and no bindparam options:

-Fatal error: Uncaught PDOException: SQLSTATE\[42000\]: \[Microsoft\]\[ODBC Driver 1[0-9] for SQL Server\]\[SQL Server\]Implicit conversion from data type varchar to varbinary\(max\) is not allowed\. Use the CONVERT function to run this query\. in .+(\/|\\)pdo_prepare_emulatePrepare_binary\.php:[0-9]+
+Fatal error: Uncaught PDOException: SQLSTATE\[42000\]: \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Implicit conversion from data type varchar to varbinary\(max\) is not allowed\. Use the CONVERT function to run this query\. in .+(\/|\\)pdo_prepare_emulatePrepare_binary\.php:[0-9]+
 Stack trace:
 #0 .+(\/|\\)pdo_prepare_emulatePrepare_binary\.php\([0-9]+\): PDOStatement->execute\(\)
 #1 {main}
--- a/test/functional/pdo_sqlsrv/pdo_query_timeout.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_query_timeout.phpt
@ -66,27 +66,27 @@ function RunTest()
 RunTest();

 ?>
--EXPECT--
+--EXPECTREGEX--

 Starting test...
 Setting query timeout as an attribute in connection
-array(3) {
-  [0]=>
-  string(5) "HYT00"
-  [1]=>
-  int(0)
-  [2]=>
-  string(63) "[Microsoft][ODBC Driver 13 for SQL Server]Query timeout expired"
-}
+array\(3\) \{
+  \[0\]=>
+  string\(5\) \"HYT00\"
+  \[1\]=>
+  int\(0\)
+  \[2\]=>
+  string\(63\) \"\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Query timeout expired\"
+\}
 Setting query timeout in the statement
-array(3) {
-  [0]=>
-  string(5) "HYT00"
-  [1]=>
-  int(0)
-  [2]=>
-  string(63) "[Microsoft][ODBC Driver 13 for SQL Server]Query timeout expired"
-}
+array\(3\) \{
+  \[0\]=>
+  string\(5\) \"HYT00\"
+  \[1\]=>
+  int\(0\)
+  \[2\]=>
+  string\(63\) \"\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Query timeout expired\"
+\}

 Done
-Test "pdo_query_timeout" completed successfully.
+Test \"pdo_query_timeout\" completed successfully\.
--- a/test/functional/pdo_sqlsrv/pdo_utf8_conn.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_utf8_conn.phpt
@ -20,7 +20,7 @@ UTF-8 connection strings
 ?>
 --EXPECTREGEX--
  
-Fatal error: Uncaught PDOException: SQLSTATE\[(28000|08001|HYT00)\]: .*\[Microsoft\]\[ODBC Driver 1[0-9] for SQL Server\](\[SQL Server\])?(Named Pipes Provider: Could not open a connection to SQL Server \[2\]\. |Login timeout expired|Login failed for user 'sa'\.) in .+(\/|\\)pdo_utf8_conn\.php:[0-9]+
+Fatal error: Uncaught PDOException: SQLSTATE\[(28000|08001|HYT00)\]: .*\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\](\[SQL Server\])?(Named Pipes Provider: Could not open a connection to SQL Server \[2\]\. |Login timeout expired|Login failed for user 'sa'\.) in .+(\/|\\)pdo_utf8_conn\.php:[0-9]+
 Stack trace:
 #0 .+(\/|\\)pdo_utf8_conn\.php\([0-9]+\): PDO->__construct\('sqlsrv:Server=l\.\.\.', 'sa', 'Sunshine4u'\)
 #1 {main}
--- a/test/functional/pdo_sqlsrv/pdo_warnings.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_warnings.phpt
@ -35,4 +35,4 @@ Error Message: An unsupported attribute was designated on the PDO object\.

 Warning: PDO::getAttribute\(\): SQLSTATE\[IM001\]: Driver does not support this function: driver does not support that attribute in .+(\/|\\)pdo_warnings\.php on line [0-9]+

-Warning: PDOStatement::execute\(\): SQLSTATE\[42000\]: Syntax error or access violation: 156 \[Microsoft\]\[ODBC Driver [0-9]+ for SQL Server\]\[SQL Server\]Incorrect syntax near the keyword 'TABLE'\. in .+(\/|\\)pdo_warnings\.php on line [0-9]+
+Warning: PDOStatement::execute\(\): SQLSTATE\[42000\]: Syntax error or access violation: 156 \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Incorrect syntax near the keyword 'TABLE'\. in .+(\/|\\)pdo_warnings\.php on line [0-9]+
--- a/test/functional/sqlsrv/0068.phpt
+++ b/test/functional/sqlsrv/0068.phpt
@ -50,8 +50,8 @@ Array
            \[SQLSTATE\] => 42000
            \[1\] => 257
            \[code\] => 257
-            \[2\] => \[Microsoft\]\[ODBC Driver 1[0-9] for SQL Server\]\[SQL Server\]Implicit conversion from data type varchar\(max\) to varbinary\(max\) is not allowed\. Use the CONVERT function to run this query\.
-            \[message\] => \[Microsoft\]\[ODBC Driver 1[0-9] for SQL Server\]\[SQL Server\]Implicit conversion from data type varchar\(max\) to varbinary\(max\) is not allowed\. Use the CONVERT function to run this query\.
+            \[2\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Implicit conversion from data type varchar\(max\) to varbinary\(max\) is not allowed\. Use the CONVERT function to run this query\.
+            \[message\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Implicit conversion from data type varchar\(max\) to varbinary\(max\) is not allowed\. Use the CONVERT function to run this query\.
        \)

    \[1\] => Array
@ -60,8 +60,8 @@ Array
            \[SQLSTATE\] => 42000
            \[1\] => 8180
            \[code\] => 8180
-            \[2\] => \[Microsoft\]\[ODBC Driver 1[0-9] for SQL Server\]\[SQL Server\]Statement\(s\) could not be prepared\.
-            \[message\] => \[Microsoft\]\[ODBC Driver 1[0-9] for SQL Server\]\[SQL Server\]Statement\(s\) could not be prepared\.
+            \[2\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Statement\(s\) could not be prepared\.
+            \[message\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Statement\(s\) could not be prepared\.
        \)

 \)
--- a/test/functional/sqlsrv/sqlsrv_complex_query.phpt
+++ b/test/functional/sqlsrv/sqlsrv_complex_query.phpt
@ -91,7 +91,7 @@ Repro();
 --EXPECTREGEX--

 Test begins...
-\[Microsoft\]\[ODBC Driver 13 for SQL Server\]\[SQL Server\]Cannot insert explicit value for identity column in table '.+' when IDENTITY_INSERT is set to OFF.
+\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Cannot insert explicit value for identity column in table '.+' when IDENTITY_INSERT is set to OFF.
 544
 23000
 Number of rows inserted: 2
--- a/test/functional/sqlsrv/sqlsrv_connect_encrypted.phpt
+++ b/test/functional/sqlsrv/sqlsrv_connect_encrypted.phpt
@ -64,8 +64,8 @@ Array
            \[SQLSTATE\] => 08001
            \[1\] => 0
            \[code\] => 0
-            \[2\] => .*\[Microsoft\]\[ODBC Driver 13 for SQL Server\]Invalid value specified for connection string attribute 'ColumnEncryption'
-            \[message\] => .*\[Microsoft\]\[ODBC Driver 13 for SQL Server\]Invalid value specified for connection string attribute 'ColumnEncryption'
+            \[2\] => .*\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Invalid value specified for connection string attribute 'ColumnEncryption'
+            \[message\] => .*\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Invalid value specified for connection string attribute 'ColumnEncryption'
        \)

 \)
--- a/test/functional/sqlsrv/sqlsrv_get_field.phpt
+++ b/test/functional/sqlsrv/sqlsrv_get_field.phpt
@ -254,9 +254,9 @@ array\(1\) \{
    \["code"\]=>
    int\(0\)
    \[2\]=>
-    string\(68\) "\[Microsoft\]\[ODBC Driver 1[0-9] for SQL Server\]Numeric value out of range"
+    string\(68\) "\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Numeric value out of range"
    \["message"\]=>
-    string\(68\) "\[Microsoft\]\[ODBC Driver 1[0-9] for SQL Server\]Numeric value out of range"
+    string\(68\) "\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Numeric value out of range"
  \}
 \}
 NULL
@ -292,9 +292,9 @@ array\(1\) \{
    \["code"\]=>
    int\(0\)
    \[2\]=>
-    string\(68\) "\[Microsoft\]\[ODBC Driver 1[0-9] for SQL Server\]Numeric value out of range"
+    string\(68\) "\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Numeric value out of range"
    \["message"\]=>
-    string\(68\) "\[Microsoft\]\[ODBC Driver 1[0-9] for SQL Server\]Numeric value out of range"
+    string\(68\) "\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Numeric value out of range"
  \}
 \}
 NULL
--- a/test/functional/sqlsrv/sqlsrv_param_output_variants.phpt
+++ b/test/functional/sqlsrv/sqlsrv_param_output_variants.phpt
@ -129,11 +129,11 @@ function RunTest()
 RunTest();

 ?>
--EXPECT--
+--EXPECTREGEX--
 
-[Microsoft][ODBC Driver 13 for SQL Server][SQL Server]Operand type clash: varchar(max) is incompatible with sql_variant
+\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Operand type clash: varchar\(max\) is incompatible with sql_variant

-[Microsoft][ODBC Driver 13 for SQL Server][SQL Server]Operand type clash: varchar(max) is incompatible with sql_variant
+\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Operand type clash: varchar\(max\) is incompatible with sql_variant

 Done
-Test "sqlsrv_param_output_variants" completed successfully.
+Test \"sqlsrv_param_output_variants\" completed successfully\.
--- a/test/functional/sqlsrv/sqlsrv_statement_cancel.phpt
+++ b/test/functional/sqlsrv/sqlsrv_statement_cancel.phpt
@ -94,9 +94,9 @@ Repro();
 --EXPECTREGEX--

 Test begins...
-(.*\[Driver Manager\]|\[Microsoft\](\[ODBC Driver 13 for SQL Server\]|\[ODBC Driver Manager\]))([ ]{0,1}Function sequence error)
+(.*\[Driver Manager\]|\[Microsoft\](\[ODBC Driver 1[1-9] for SQL Server\]|\[ODBC Driver Manager\]))([ ]{0,1}Function sequence error)
 0
 (HY010)

 Done
-Test "sqlsrv_statement_cancel" completed successfully.
+Test \"sqlsrv_statement_cancel\" completed successfully\.
--- a/test/functional/sqlsrv/sqlsrv_statement_query_timeout.phpt
+++ b/test/functional/sqlsrv/sqlsrv_statement_query_timeout.phpt
@ -60,15 +60,15 @@ function Repro()
 Repro();

 ?>
--EXPECT--
+--EXPECTREGEX--

 Test begins...
-[Microsoft][ODBC Driver 13 for SQL Server]Query timeout expired
+\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Query timeout expired
 0
 HYT00
-[Microsoft][ODBC Driver 13 for SQL Server]Query timeout expired
+\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Query timeout expired
 0
 HYT00

 Done
-Test "sqlsrv_statement_query_timeout" completed successfully.
+Test \"sqlsrv_statement_query_timeout\" completed successfully\.
--- a/test/functional/sqlsrv/sqlsrv_statement_query_timeout_transaction.phpt
+++ b/test/functional/sqlsrv/sqlsrv_statement_query_timeout_transaction.phpt
@ -74,15 +74,15 @@ function Repro()
 Repro();

 ?>
--EXPECT--
+--EXPECTREGEX--

 Test begins...
-[Microsoft][ODBC Driver 13 for SQL Server]Query timeout expired
+\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Query timeout expired
 0
 HYT00
-[Microsoft][ODBC Driver 13 for SQL Server]Query timeout expired
+\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Query timeout expired
 0
 HYT00

 Done
-Test "sqlsrv_statement_query_timeout_transaction" completed successfully.
+Test \"sqlsrv_statement_query_timeout_transaction\" completed successfully\.
--- a/test/functional/sqlsrv/srv_050_error_conversion_varchar_int.phpt
+++ b/test/functional/sqlsrv/srv_050_error_conversion_varchar_int.phpt
@ -32,14 +32,14 @@ sqlsrv_close($conn);
 print "Done"
 ?>

--EXPECT--
+--EXPECTREGEX--
 Array
-(
-    [0] => 22018
-    [SQLSTATE] => 22018
-    [1] => 245
-    [code] => 245
-    [2] => [Microsoft][ODBC Driver 13 for SQL Server][SQL Server]Conversion failed when converting the varchar value 'null' to data type int.
-    [message] => [Microsoft][ODBC Driver 13 for SQL Server][SQL Server]Conversion failed when converting the varchar value 'null' to data type int.
-)
+\(
+    \[0\] => 22018
+    \[SQLSTATE\] => 22018
+    \[1\] => 245
+    \[code\] => 245
+    \[2\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Conversion failed when converting the varchar value 'null' to data type int.
+    \[message\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Conversion failed when converting the varchar value 'null' to data type int.
+\)
 Done
--- a/test/functional/sqlsrv/srv_051_error_conversion_nchar.phpt
+++ b/test/functional/sqlsrv/srv_051_error_conversion_nchar.phpt
@ -32,14 +32,14 @@ sqlsrv_close($conn);
 print "Done"
 ?>

--EXPECT--
+--EXPECTREGEX--
 Array
-(
-    [0] => 22018
-    [SQLSTATE] => 22018
-    [1] => 245
-    [code] => 245
-    [2] => [Microsoft][ODBC Driver 13 for SQL Server][SQL Server]Conversion failed when converting the nvarchar value '银河' to data type int.
-    [message] => [Microsoft][ODBC Driver 13 for SQL Server][SQL Server]Conversion failed when converting the nvarchar value '银河' to data type int.
-)
+\(
+    \[0\] => 22018
+    \[SQLSTATE\] => 22018
+    \[1\] => 245
+    \[code\] => 245
+    \[2\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Conversion failed when converting the nvarchar value '银河' to data type int.
+    \[message\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\]Conversion failed when converting the nvarchar value '银河' to data type int.
+\)
 Done
--- a/test/functional/sqlsrv/srv_053_mars_disabled_error_checks.phpt
+++ b/test/functional/sqlsrv/srv_053_mars_disabled_error_checks.phpt
@ -32,27 +32,27 @@ sqlsrv_close($conn);
 print "Done"
 ?>

--EXPECT--
+--EXPECTREGEX--
 Array
-(
-    [0] => Array
-        (
-            [0] => IMSSP
-            [SQLSTATE] => IMSSP
-            [1] => -44
-            [code] => -44
-            [2] => The connection cannot process this operation because there is a statement with pending results.  To make the connection available for other queries, either fetch all results or cancel or free the statement.  For more information, see the product documentation about the MultipleActiveResultSets connection option.
-            [message] => The connection cannot process this operation because there is a statement with pending results.  To make the connection available for other queries, either fetch all results or cancel or free the statement.  For more information, see the product documentation about the MultipleActiveResultSets connection option.
-        )
+\(
+    \[0\] => Array
+        \(
+            \[0\] => IMSSP
+            \[SQLSTATE\] => IMSSP
+            \[1\] => -44
+            \[code\] => -44
+            \[2\] => The connection cannot process this operation because there is a statement with pending results.  To make the connection available for other queries, either fetch all results or cancel or free the statement.  For more information, see the product documentation about the MultipleActiveResultSets connection option.
+            \[message\] => The connection cannot process this operation because there is a statement with pending results.  To make the connection available for other queries, either fetch all results or cancel or free the statement.  For more information, see the product documentation about the MultipleActiveResultSets connection option.
+        \)

-    [1] => Array
-        (
-            [0] => HY000
-            [SQLSTATE] => HY000
-            [1] => 0
-            [code] => 0
-            [2] => [Microsoft][ODBC Driver 13 for SQL Server]Connection is busy with results for another command
-            [message] => [Microsoft][ODBC Driver 13 for SQL Server]Connection is busy with results for another command
-        )
+    \[1\] => Array
+        \(
+            \[0\] => HY000
+            \[SQLSTATE\] => HY000
+            \[1\] => 0
+            \[code\] => 0
+            \[2\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Connection is busy with results for another command
+            \[message\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Connection is busy with results for another command
+        \)

-)
+\)
--- a/test/functional/sqlsrv/srv_075_database_wide_string.phpt
+++ b/test/functional/sqlsrv/srv_075_database_wide_string.phpt
@ -41,5 +41,5 @@ print "Done";
 bool\(false\)
 string\(5\) "(42S02|08004)"
 int\((3701|911)\)
-string\([0-9]+\) "\[Microsoft\]\[ODBC Driver 13 for SQL Server\]\[SQL Server\](Cannot drop the database 'uniqueDB01_银河系', because it does not exist or you do not have permission\.|Database 'uniqueDB01_银河系' does not exist. Make sure that the name is entered correctly\.)"
+string\([0-9]+\) "\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]\[SQL Server\](Cannot drop the database 'uniqueDB01_银河系', because it does not exist or you do not have permission\.|Database 'uniqueDB01_银河系' does not exist. Make sure that the name is entered correctly\.)"
 Done
--- a/test/functional/sqlsrv/test_connectionOption.phpt
+++ b/test/functional/sqlsrv/test_connectionOption.phpt
@ -49,8 +49,8 @@ Array
            \[SQLSTATE\] => HY000
            \[1\] => 0
            \[code\] => 0
-            \[2\] => \[Microsoft\]\[ODBC Driver 1[0-9] for SQL Server\]Connection is busy with results for another command
-            \[message\] => \[Microsoft\]\[ODBC Driver 1[0-9] for SQL Server\]Connection is busy with results for another command
+            \[2\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Connection is busy with results for another command
+            \[message\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Connection is busy with results for another command
        \)

 \)
--- a/test/functional/sqlsrv/test_scrollable.phpt
+++ b/test/functional/sqlsrv/test_scrollable.phpt
@ -236,8 +236,8 @@ Array
            \[SQLSTATE\] => HY109
            \[1\] => 0
            \[code\] => 0
-            \[2\] => \[Microsoft\]\[ODBC Driver 1[0-9] for SQL Server\]Invalid cursor position
-            \[message\] => \[Microsoft\]\[ODBC Driver 1[0-9] for SQL Server\]Invalid cursor position
+            \[2\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Invalid cursor position
+            \[message\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Invalid cursor position
        \)

 \)