From 2193628368df97db542ad9c4065b0d6f08af3ba6 Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Thu, 25 Apr 2019 14:54:56 -0700
Subject: [PATCH] Revert "Used different skipif conditions for these two tests
 that require AE connections (#977)"

This reverts commit ee3c85afa863eaff81512ad6399de572ffb943d9.
---
 .../pdo_sqlsrv/pdo_569_query_varcharmax.phpt  | 31 ++++++----------
 .../sqlsrv/srv_569_query_varcharmax.phpt      | 36 +++++++++----------
 2 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/test/functional/pdo_sqlsrv/pdo_569_query_varcharmax.phpt b/test/functional/pdo_sqlsrv/pdo_569_query_varcharmax.phpt
index 0d3617336..671cbc269 100644
--- a/test/functional/pdo_sqlsrv/pdo_569_query_varcharmax.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_569_query_varcharmax.phpt
@@ -5,32 +5,23 @@ Verifies that the problem is no longer reproducible.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php 
-if (!extension_loaded("pdo") || !extension_loaded('pdo_sqlsrv')) {
-    die("PDO driver cannot be loaded; skipping test.\n");
-}
-
-require_once("MsSetup.inc");
-require_once("MsCommon_mid-refactor.inc");
-
-// This test requires to connect with the Always Encrypted feature
-// First check if the system is qualified to run this test
-$dsn = getDSN($server, null);
-$conn = new PDO($dsn, $uid, $pwd);
-if (! $conn) {
-    die("Error: could not connect during SKIPIF!");
-} 
-
-if (!isAEQualified($conn)) {
-    die("skip - AE feature not supported in the current environment.");
-}
-?>
+<?php require('skipif_mid-refactor.inc'); ?>
 --FILE--
 <?php
 require_once("MsSetup.inc");
 require_once("MsCommon_mid-refactor.inc");
 
 try {
+    // This test requires to connect with the Always Encrypted feature
+    // First check if the system is qualified to run this test
+    $dsn = getDSN($server, null);
+    $conn = new PDO($dsn, $uid, $pwd);
+    if (!isAEQualified($conn)) {
+        echo "Done\n";
+        return;
+    }
+    unset($conn);
+
     // Now connect with ColumnEncryption enabled
     $connectionInfo = "ColumnEncryption = Enabled;";
     $conn = new PDO("sqlsrv:server = $server; database=$databaseName; $connectionInfo", $uid, $pwd);
diff --git a/test/functional/sqlsrv/srv_569_query_varcharmax.phpt b/test/functional/sqlsrv/srv_569_query_varcharmax.phpt
index 2496c6d91..314ec54cc 100644
--- a/test/functional/sqlsrv/srv_569_query_varcharmax.phpt
+++ b/test/functional/sqlsrv/srv_569_query_varcharmax.phpt
@@ -5,25 +5,7 @@ Verifies that the problem is no longer reproducible.
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php 
-if (! extension_loaded("sqlsrv")) {
-    die("skip extension not loaded");
-}
-
-require_once('MsCommon.inc');
-
-// This test requires to connect with the Always Encrypted feature
-// First check if the system is qualified to run this test
-$options = array("Database" => $database, "UID" => $userName, "PWD" => $userPassword);
-$conn = sqlsrv_connect($server, $options);
-if ($conn === false) {
-    die("Error: could not connect during SKIPIF!");
-}
-
-if (!AE\isQualified($conn)) {
-    die("skip - AE feature not supported in the current environment.");
-}
-?>
+<?php require('skipif_versions_old.inc'); ?>
 --FILE--
 <?php
 
@@ -37,8 +19,22 @@ function verifyFetchError()
 
 require_once('MsCommon.inc');
 
+// This test requires to connect with the Always Encrypted feature
+// First check if the system is qualified to run this test
+$options = array("Database" => $database, "UID" => $userName, "PWD" => $userPassword);
+$conn = sqlsrv_connect($server, $options);
+if ($conn === false) {
+    fatalError("Failed to connect to $server.");
+}
+
+if (!AE\isQualified($conn)) {
+    echo "Done\n";
+    return;
+}
+sqlsrv_close($conn);
+
 // Now connect with ColumnEncryption enabled
-$connectionOptions = array("Database" => $database, "UID" => $userName, "PWD" => $userPassword, 'ColumnEncryption' => 'Enabled');
+$connectionOptions = array_merge($options, array('ColumnEncryption' => 'Enabled'));
 $conn = sqlsrv_connect($server, $connectionOptions);
 if ($conn === false) {
     fatalError("Failed to connect to $server.");