From: Adam Baratz <adambaratz@php.net>
Date: Fri, 10 Nov 2017 19:26:25 +0000 (-0500)
Subject: Use TDS version attribute to determine whether to skip tests
X-Git-Tag: php-7.3.0alpha1~1058
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1027ed3767f0f9744390440838579b51b5b98a7f;p=php

Use TDS version attribute to determine whether to skip tests
---

diff --git a/ext/pdo_dblib/tests/config.inc b/ext/pdo_dblib/tests/config.inc
index 40e8bf6ff9..2723090f08 100644
--- a/ext/pdo_dblib/tests/config.inc
+++ b/ext/pdo_dblib/tests/config.inc
@@ -1,21 +1,5 @@
 <?php
 
-function get_tds_version() {
-	global $dsn;
-
-	$dsn_parts = explode(':', $dsn, 2);
-	if ($dsn_parts[0] == 'dblib') { // uri is an option, which we'll ignore
-		foreach (explode(';', $dsn_parts[1]) as $arg) {
-			$arg = explode('=', $arg);
-			if ($arg[0] == 'version') {
-				return $arg[1];
-			}
-		}
-	}
-
-	return null;
-}
-
 // bug #72969 reflects a bug with FreeTDS, not with pdo_dblib
 // this function will version detect so the relevant tests can XFAILIF
 function driver_supports_batch_statements_without_select($db) {
diff --git a/ext/pdo_dblib/tests/stringify_uniqueidentifier.phpt b/ext/pdo_dblib/tests/stringify_uniqueidentifier.phpt
index 02b28257df..627efed168 100644
--- a/ext/pdo_dblib/tests/stringify_uniqueidentifier.phpt
+++ b/ext/pdo_dblib/tests/stringify_uniqueidentifier.phpt
@@ -4,7 +4,7 @@ PDO_DBLIB: Uniqueidentifier column data type stringifying
 <?php
 if (!extension_loaded('pdo_dblib')) die('skip not loaded');
 require __DIR__ . '/config.inc';
-if (in_array(get_tds_version(), ['4.2', '4.6'])) die('skip feature unsupported by this TDS version');
+if (in_array($db->getAttribute(PDO::DBLIB_ATTR_TDS_VERSION), ['4.2', '4.6'])) die('skip feature unsupported by this TDS version');
 ?>
 --FILE--
 <?php
diff --git a/ext/pdo_dblib/tests/types.phpt b/ext/pdo_dblib/tests/types.phpt
index 6f5d2f2e19..a4d4fd39f7 100644
--- a/ext/pdo_dblib/tests/types.phpt
+++ b/ext/pdo_dblib/tests/types.phpt
@@ -10,7 +10,9 @@ require __DIR__ . '/config.inc';
 require __DIR__ . '/config.inc';
 
 function get_expected_float_string() {
-	switch (get_tds_version()) {
+	global $db;
+
+	switch ($db->getAttribute(PDO::DBLIB_ATTR_TDS_VERSION)) {
 		case '5.0':
 		case '6.0':
 		case '7.0':