From c1d579319d7c0e1c8fae9d4bc4167afac950188e Mon Sep 17 00:00:00 2001
From: David Puglielli <v-dapugl@microsoft.com>
Date: Thu, 12 Jul 2018 13:24:04 -0700
Subject: [PATCH] Fixed driver name

---
 .../pdo_sqlsrv/MsCommon_mid-refactor.inc         |  2 +-
 .../pdo_sqlsrv/skipif_version_less_than_2k16.inc | 16 ++++++++++++++++
 .../sqlsrv/skipif_version_less_than_2k16.inc     | 15 +++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/test/functional/pdo_sqlsrv/MsCommon_mid-refactor.inc b/test/functional/pdo_sqlsrv/MsCommon_mid-refactor.inc
index 24633ff8..cf2ff605 100644
--- a/test/functional/pdo_sqlsrv/MsCommon_mid-refactor.inc
+++ b/test/functional/pdo_sqlsrv/MsCommon_mid-refactor.inc
@@ -48,7 +48,7 @@ function connect($keywords = '', $options=array(), $errmode = PDO::ERRMODE_EXCEP
         // simply use $databaseName from MsSetup.inc to facilitate testing in Azure,
         // which does not support switching databases
         require("MsSetup.inc");
-        $dsn = getDSN($server, $databaseName, $DriverName, $keywords, $disableCE);
+        $dsn = getDSN($server, $databaseName, $driver, $keywords, $disableCE);
         $conn = new PDO($dsn, $uid, $pwd, $options);
         if ($errmode == PDO::ERRMODE_EXCEPTION || $errmode == PDO::ERRMODE_WARNING || $errmode == PDO::ERRMODE_SILENT) {
             $conn->setAttribute(PDO::ATTR_ERRMODE, $errmode);
diff --git a/test/functional/pdo_sqlsrv/skipif_version_less_than_2k16.inc b/test/functional/pdo_sqlsrv/skipif_version_less_than_2k16.inc
index 5a413420..72553974 100644
--- a/test/functional/pdo_sqlsrv/skipif_version_less_than_2k16.inc
+++ b/test/functional/pdo_sqlsrv/skipif_version_less_than_2k16.inc
@@ -1,8 +1,14 @@
 <?php
+// For Azure ActiveDirectory, must check that 
+// 1. Either running Windows, or ODBC driver 17 or greater on unix
+// 2. Either SQL Server version is 2016 or greater, or using Azure
+
 if (!extension_loaded("pdo_sqlsrv")) {
     die("skip Extension not loaded");
 }
 
+$is_win = ( strtoupper( substr( php_uname( 's' ),0,3 ) ) === 'WIN' );
+
 require_once( "MsSetup.inc" );
 
 $conn = new PDO( "sqlsrv:server = $server ;", $uid, $pwd );
@@ -10,6 +16,16 @@ if ($conn === false) {
     die( "skip Could not connect during SKIPIF." );
 }
 
+$msodbcsql_ver = $conn->getAttribute(PDO::ATTR_CLIENT_VERSION)["DriverVer"];
+$msodbcsql_maj = explode(".", $msodbcsql_ver)[0];
+$msodbcsql_min = explode(".", $msodbcsql_ver)[1];
+
+if (!$is_win) {
+    if ($msodbcsql_maj < 17) {
+        die("skip Unsupported ODBC driver version");
+    }
+}
+
 // Get SQL Server Version
 // Exclude this check if running on Azure
 if (!$daasMode) {
diff --git a/test/functional/sqlsrv/skipif_version_less_than_2k16.inc b/test/functional/sqlsrv/skipif_version_less_than_2k16.inc
index fdd4c11d..ce06258a 100644
--- a/test/functional/sqlsrv/skipif_version_less_than_2k16.inc
+++ b/test/functional/sqlsrv/skipif_version_less_than_2k16.inc
@@ -1,8 +1,14 @@
 <?php
+// For Azure ActiveDirectory, must check that 
+// 1. Either running Windows, or ODBC driver 17 or greater on unix
+// 2. Either SQL Server version is 2016 or greater, or using Azure
+
 if (!extension_loaded("sqlsrv")) {
     die("skip Extension not loaded");
 }
 
+$is_win = ( strtoupper( substr( php_uname( 's' ),0,3 ) ) === 'WIN' );
+
 require_once( "MsSetup.inc" );
 
 $connectionInfo = array( "UID"=>$userName, "PWD"=>$userPassword );
@@ -12,6 +18,15 @@ if ($conn === false) {
     die( "skip Could not connect during SKIPIF." );
 }
 
+$msodbcsql_ver = sqlsrv_client_info($conn)["DriverVer"];
+$msodbcsql_maj = explode(".", $msodbcsql_ver)[0];
+
+if (!$is_win) {
+    if ($msodbcsql_maj < 17) {
+        die("skip Unsupported ODBC driver version");
+    }
+}
+
 // Get SQL Server version
 // Exclude this check if running on Azure
 if (!$daasMode) {