From 82be8141a3c56dc071acfc8a72669c76d9c35c26 Mon Sep 17 00:00:00 2001
From: David Puglielli <v-dapugl@microsoft.com>
Date: Wed, 11 Jul 2018 11:29:34 -0700
Subject: [PATCH] Fixed output and skipifs

---
 .../pdo_707_ae_output_param_decimals.phpt     |  2 +-
 .../pdo_sqlsrv/pdo_connect_encrypted.phpt     |  2 +-
 .../pdo_sqlsrv/pdo_connection_resiliency.phpt |  3 ++-
 .../pdo_connection_resiliency_keywords.phpt   |  3 ++-
 ...onnection_resiliency_prepare_transact.phpt |  3 ++-
 .../pdo_connection_resiliency_timeouts.phpt   |  3 ++-
 .../skipif_version_less_than_2k14.inc         | 21 +++++++++++--------
 ...onnection_resiliency_prepare_transact.phpt |  4 ++--
 8 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/test/functional/pdo_sqlsrv/pdo_707_ae_output_param_decimals.phpt b/test/functional/pdo_sqlsrv/pdo_707_ae_output_param_decimals.phpt
index 8433d194..67c0f4fd 100644
--- a/test/functional/pdo_sqlsrv/pdo_707_ae_output_param_decimals.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_707_ae_output_param_decimals.phpt
@@ -7,7 +7,7 @@ do not need to be encrypted
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_mid-refactor.inc'); ?>
 --FILE--
 <?php
 require_once("MsSetup.inc");
diff --git a/test/functional/pdo_sqlsrv/pdo_connect_encrypted.phpt b/test/functional/pdo_sqlsrv/pdo_connect_encrypted.phpt
index cb073668..124df22b 100644
--- a/test/functional/pdo_sqlsrv/pdo_connect_encrypted.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_connect_encrypted.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test new connection keyword ColumnEncryption
 --SKIPIF--
-<?php require('skipif.inc'); ?>
+<?php require('skipif_mid-refactor.inc'); ?>
 --FILE--
 <?php
 require_once("MsSetup.inc");
diff --git a/test/functional/pdo_sqlsrv/pdo_connection_resiliency.phpt b/test/functional/pdo_sqlsrv/pdo_connection_resiliency.phpt
index 3eb8b4f6..4fad6e5e 100644
--- a/test/functional/pdo_sqlsrv/pdo_connection_resiliency.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_connection_resiliency.phpt
@@ -7,7 +7,8 @@ killing the connection and then not freeing it. The latter case is the only one
 that should fail. Finally, execute two queries in two threads on a recovered
 non-MARS connection. This should fail too.
 --SKIPIF--
-<?php require('skipif_protocol_not_tcp.inc');
+<?php require('skipif_mid-refactor.inc');
+      require('skipif_protocol_not_tcp.inc');
       require('skipif_version_less_than_2k14.inc');  ?>
 --FILE--
 <?php
diff --git a/test/functional/pdo_sqlsrv/pdo_connection_resiliency_keywords.phpt b/test/functional/pdo_sqlsrv/pdo_connection_resiliency_keywords.phpt
index b012eed9..326f6ee0 100644
--- a/test/functional/pdo_sqlsrv/pdo_connection_resiliency_keywords.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_connection_resiliency_keywords.phpt
@@ -1,7 +1,8 @@
 --TEST--
 Test the connection resiliency keywords ConnectRetryCount and ConnectRetryInterval and their ranges of acceptable values
 --SKIPIF--
-<?php require('skipif_version_less_than_2k14.inc');  ?>
+<?php require('skipif_mid-refactor.inc');
+      require('skipif_version_less_than_2k14.inc');  ?>
 --FILE--
 <?php
 require_once( "MsSetup.inc" );
diff --git a/test/functional/pdo_sqlsrv/pdo_connection_resiliency_prepare_transact.phpt b/test/functional/pdo_sqlsrv/pdo_connection_resiliency_prepare_transact.phpt
index 95db2b5b..d65bc7a1 100644
--- a/test/functional/pdo_sqlsrv/pdo_connection_resiliency_prepare_transact.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_connection_resiliency_prepare_transact.phpt
@@ -5,7 +5,8 @@ Prepare a statement, break the connection, and execute the statement. Then
 test transactions by breaking the connection before beginning a transaction
 and in the middle of the transaction. The latter case should fail.
 --SKIPIF--
-<?php require('skipif_protocol_not_tcp.inc');
+<?php require('skipif_mid-refactor.inc');
+      require('skipif_protocol_not_tcp.inc');
       require('skipif_version_less_than_2k14.inc');  ?>
 --FILE--
 <?php
diff --git a/test/functional/pdo_sqlsrv/pdo_connection_resiliency_timeouts.phpt b/test/functional/pdo_sqlsrv/pdo_connection_resiliency_timeouts.phpt
index 375ae637..cb74a891 100644
--- a/test/functional/pdo_sqlsrv/pdo_connection_resiliency_timeouts.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_connection_resiliency_timeouts.phpt
@@ -4,7 +4,8 @@ Test connection resiliency timeouts
 1. Connect with ConnectRetryCount equal to 0.
 2. Reconnect with the default value of ConnectRetryCount(1).
 --SKIPIF--
-<?php require('skipif_protocol_not_tcp.inc');
+<?php require('skipif_mid-refactor.inc');
+      require('skipif_protocol_not_tcp.inc');
       require('skipif_version_less_than_2k14.inc'); ?>
 --FILE--
 <?php
diff --git a/test/functional/pdo_sqlsrv/skipif_version_less_than_2k14.inc b/test/functional/pdo_sqlsrv/skipif_version_less_than_2k14.inc
index e3c3b11a..52fc358a 100644
--- a/test/functional/pdo_sqlsrv/skipif_version_less_than_2k14.inc
+++ b/test/functional/pdo_sqlsrv/skipif_version_less_than_2k14.inc
@@ -11,16 +11,19 @@ if ($conn === false) {
 }
 
 // Get SQL Server Version
-$stmt = $conn->query( "SELECT @@VERSION" );
-if ($stmt) {
-    $ver_string = $stmt->fetch(PDO::FETCH_NUM)[0];
-} else {
-    die( "skip Could not fetch SQL Server version during SKIPIF.");
-}
+// Exclude this check if running on Azure
+if (!$daasMode) {
+    $stmt = $conn->query( "SELECT @@VERSION" );
+    if ($stmt) {
+        $ver_string = $stmt->fetch(PDO::FETCH_NUM)[0];
+    } else {
+        die( "skip Could not fetch SQL Server version during SKIPIF.");
+    }
 
-$version = explode(' ', $ver_string);
+    $version = explode(' ', $ver_string);
 
-if ($version[3] < '2014') {
-    die("skip Wrong version of SQL Server, 2014 or later required");
+    if ($version[3] < '2014') {
+        die("skip Wrong version of SQL Server, 2014 or later required");
+    }
 }
 ?>
diff --git a/test/functional/sqlsrv/connection_resiliency_prepare_transact.phpt b/test/functional/sqlsrv/connection_resiliency_prepare_transact.phpt
index 8f5a3e1b..5d30280e 100644
--- a/test/functional/sqlsrv/connection_resiliency_prepare_transact.phpt
+++ b/test/functional/sqlsrv/connection_resiliency_prepare_transact.phpt
@@ -189,8 +189,8 @@ Array
             \[SQLSTATE\] => 08S02
             \[1\] => (10054|-1)
             \[code\] => (10054|-1)
-            \[2\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\](TCP Provider: An existing connection was forcibly closed by the remote host\.\n|SMux Provider: Physical connection is not usable \[xFFFFFFFF\])
-            \[message\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\](TCP Provider: An existing connection was forcibly closed by the remote host\.\n|SMux Provider: Physical connection is not usable \[xFFFFFFFF\])
+            \[2\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\](TCP Provider: An existing connection was forcibly closed by the remote host\.\n|SMux Provider: Physical connection is not usable \[xFFFFFFFF\])\. 
+            \[message\] => \[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\](TCP Provider: An existing connection was forcibly closed by the remote host\.\n|SMux Provider: Physical connection is not usable \[xFFFFFFFF\])\. 
         \)
 
     \[1\] => Array