From d7a1aca5c782bfad97c36e595705dd22e5dd4ba5 Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Tue, 19 Dec 2017 14:35:28 -0800
Subject: [PATCH] Testing locale issues

---
 test/functional/sqlsrv/MsCommon.inc | 21 ++++++++-------------
 test/functional/sqlsrv/MsHelper.inc |  2 +-
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/test/functional/sqlsrv/MsCommon.inc b/test/functional/sqlsrv/MsCommon.inc
index 964e5efe..7d5123c4 100644
--- a/test/functional/sqlsrv/MsCommon.inc
+++ b/test/functional/sqlsrv/MsCommon.inc
@@ -84,18 +84,6 @@ function isDaasMode()
     return ($daasMode ? true : false);
 }
 
-// function isAEQualified($conn)
-// {
-    // $msodbcsql_ver = sqlsrv_client_info($conn)['DriverVer'];
-    // $server_ver = sqlsrv_server_info($conn)['SQLServerVersion'];
-    // $msodbcsql_maj = explode(".", $msodbcsql_ver)[0];
-    // $msodbcsql_min = explode(".", $msodbcsql_ver)[1];
-    // if ($msodbcsql_maj < 17 || explode('.', $server_ver)[0] < 13) {
-        // return false;
-    // }
-    // return true;
-// }
-
 function startTest($testName)
 {
     if (traceMode()) {
@@ -455,10 +443,17 @@ function handleErrors()
 }
 
 // non-UTF8 locale support in ODBC 17 and above only
+// if AE enabled, only supported in Windows (AE limitations)
 function isLocaleSupported()
 {
+    if (isWindows()) {
+        return true;
+    }
+    if (AE\isDataEncrypted()) {
+        return false;
+    }
+    // now check ODBC version
     $conn = AE\connect();
-
     $msodbcsql_ver = sqlsrv_client_info($conn)['DriverVer'];
     if (explode(".", $msodbcsql_ver)[0] < 17) {
         return false;
diff --git a/test/functional/sqlsrv/MsHelper.inc b/test/functional/sqlsrv/MsHelper.inc
index 988253b1..6792bfe2 100644
--- a/test/functional/sqlsrv/MsHelper.inc
+++ b/test/functional/sqlsrv/MsHelper.inc
@@ -330,7 +330,7 @@ function getSeqPlaceholders($num)
  */
 function isColEncrypted()
 {
-    global $keystore, $dataEncrypted;
+    global $keystore;
     if ($keystore === KEYSTORE_NONE) {
         return false;
     } else {