From 06e92979d2b1f9fb0a7e3716e34bb2acb0001f78 Mon Sep 17 00:00:00 2001 From: Jenny Tam Date: Mon, 30 Apr 2018 12:51:18 -0700 Subject: [PATCH] Use helper method isAEQualified instead --- .../pdo_707_ae_output_param_decimals.phpt | 24 +------------------ 1 file changed, 1 insertion(+), 23 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 28954175..6b59c134 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 @@ -15,28 +15,6 @@ require_once("MsCommon_mid-refactor.inc"); $error = "Error converting a double (value out of range) to an integer"; -function skipTest($conn) -{ - $msodbcsql_ver = $conn->getAttribute(PDO::ATTR_CLIENT_VERSION)["DriverVer"]; - $msodbcsql_maj = explode(".", $msodbcsql_ver)[0]; - if ($msodbcsql_maj < 17) { - return true; - } - - global $daasMode; - if ($daasMode) { - // running against Azure - return false; - } - // otherwise, check server version - $server_ver = $conn->getAttribute(PDO::ATTR_SERVER_VERSION); - if (explode('.', $server_ver)[0] < 13) { - return true; - } - - return false; -} - function getOutputs($stmt, $outSql, $id, $pdoParamType, $inout = false) { $dec = $num = 0; @@ -108,7 +86,7 @@ function getHugeNumbers($conn, $outSql) try { // Check eligibility $conn = new PDO( "sqlsrv:server = $server", $uid, $pwd ); - if (skipTest($conn)) { + if (!isAEQualified($conn)) { echo "Done\n"; return; }