From 119e42045836720ce587a3d0b99ba360f2387b6a Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Thu, 4 Jan 2018 15:21:10 -0800
Subject: [PATCH] Modified 0065 as per review

---
 test/functional/sqlsrv/0065.phpt | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/test/functional/sqlsrv/0065.phpt b/test/functional/sqlsrv/0065.phpt
index 36d4ed09..985b8e2b 100644
--- a/test/functional/sqlsrv/0065.phpt
+++ b/test/functional/sqlsrv/0065.phpt
@@ -78,11 +78,16 @@ if ($t === false) {
     die(print_r(sqlsrv_errors(), true));
 }
 
-// $t may be different in Windows and other platforms
-// what matters is that there are some '?' in $t 
-$arr = explode('?', $t);
-if (count($arr) == 1) {
-    die("varchar(100) value \'$t\' is unexpected");
+// If connected with AE, $t may be different in Windows and other platforms
+// this is a workaround for now -- to make sure there are some '?' in $t 
+if (!AE\isColEncrypted() && $t !== "So?e sä???? ?SCII-te×t") {
+    die("varchar(100) \'$t\' doesn't match So?e sä???? ?SCII-te×t");
+} else {
+    $arr = explode('?', $t);
+    if (count($arr) == 1) {
+        // this means there is no question mark in $t
+        die("varchar(100) value \'$t\' is unexpected");
+    }
 }
 
 $t = sqlsrv_get_field($s, 1, SQLSRV_PHPTYPE_STRING('utf-8'));