Unit test fixes (#1455)

* Add driver, modify expect result

* Update pdo_construct.phpt

Timeout too early the driver won't get the expected error.

* Update pdo_construct_conn_options.phpt

* Turn off trace due to UnixODBC bug

Author: absci

test/functional/pdo_sqlsrv/pdo_1261_test_ascii_utf8.phpt

@@ -15,7 +15,7 @@ try {
     ini_set('pdo_sqlsrv.log_severity', '2');
     ini_set('error_log', $logFilepath);
 
-    $conn = new PDO("sqlsrv:Server=$server;Database=$databaseName;", $uid, $pwd);
+    $conn = new PDO("sqlsrv:Server=$server;Database=$databaseName;driver=$driver;", $uid, $pwd);
     $conn->setAttribute(PDO::SQLSRV_ATTR_ENCODING, PDO::SQLSRV_ENCODING_SYSTEM);
     $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
@@ -50,8 +50,8 @@ array(1) {
 }
 [%s] pdo_sqlsrv_db_handle_factory: SQLSTATE = 01000
 [%s] pdo_sqlsrv_db_handle_factory: error code = 5701
-[%s] pdo_sqlsrv_db_handle_factory: message = [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Changed database context to '%s'.
+[%s] pdo_sqlsrv_db_handle_factory: message = [Microsoft][ODBC Driver %s for SQL Server][SQL Server]Changed database context to '%s'.
 [%s] pdo_sqlsrv_db_handle_factory: SQLSTATE = 01000
 [%s] pdo_sqlsrv_db_handle_factory: error code = 5703
-[%s] pdo_sqlsrv_db_handle_factory: message = [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Changed language setting to %s.
+[%s] pdo_sqlsrv_db_handle_factory: message = [Microsoft][ODBC Driver %s for SQL Server][SQL Server]Changed language setting to %s.
 

test/functional/pdo_sqlsrv/pdo_construct.phpt

@@ -24,15 +24,12 @@ try {
 
     $dsn =  "ConnectionPooling = false;" .
             "APP = whatever;" .
-            "LoginTimeout = 1;" .
             "ApplicationIntent = ReadOnly;" .
             "Encrypt = false;" .
             "Failover_Partner = whatever;" .
             "MultipleActiveResultSets = true;" .
             "MultiSubnetFailover = NO;" .
             "QuotedId = false;" .
-            "TraceFile = whatever;" .
-            "TraceOn = true;" .
             "TransactionIsolation = " . PDO::SQLSRV_TXN_READ_UNCOMMITTED . ";" .
             "TrustServerCertificate = false;" .
             "WSID = whatever;";
@@ -53,4 +50,4 @@ array(3) {
   [2]=>
   string(58) "An unsupported attribute was designated on the PDO object."
 }
-Test Successful
+Test Successful

test/functional/pdo_sqlsrv/pdo_construct_conn_options.phpt

@@ -10,15 +10,12 @@ require_once("MsCommon_mid-refactor.inc");
 try {
     $dsn = "ConnectionPooling = false;" .
            "APP = whatever;" .
-           "LoginTimeout = 1;" .
            "ApplicationIntent = ReadOnly;" .
            "Encrypt = false;" .
            "Failover_Partner = whatever;" .
            "MultipleActiveResultSets = true;" .
            "MultiSubnetFailover = NO;" .
            "QuotedId = false;" .
-           "TraceFile = whatever;" .
-           "TraceOn = true;" .
            "TrustServerCertificate = false;" .
            "WSID = whatever;";
     $conn = connect($dsn);

test/functional/sqlsrv/sqlsrv_testConnection_unix.phpt

@@ -73,8 +73,6 @@ if ((strtoupper(substr(php_uname('s'), 0, 3)) === 'WIN')) {
                                "LoginTimeout" => 120,
                                "MultipleActiveResultSets" => false,
                                "QuotedId" => false,
-                               "TraceOn" => true,
-                               "TraceFile" => "trace.odbc",
                                "TransactionIsolation" => SQLSRV_TXN_READ_COMMITTED,
                                "TrustServerCertificate" => 1,
                                "WSID" => "JAYKINT1" );
@@ -85,8 +83,6 @@ if ((strtoupper(substr(php_uname('s'), 0, 3)) === 'WIN')) {
                                "LoginTimeout" => 120,
                                "MultipleActiveResultSets" => false,
                                "QuotedId" => true,
-                               "TraceOn" => true,
-                               "TraceFile" => "trace.odbc",
                                "TransactionIsolation" => SQLSRV_TXN_READ_COMMITTED,
                                "TrustServerCertificate" => 1,
                                "WSID" => "JAYKINT1" );