From f71c52d63dde3bb8e5a607a6588a5d7724d1a604 Mon Sep 17 00:00:00 2001 From: David Puglielli Date: Mon, 23 Jul 2018 11:21:43 -0700 Subject: [PATCH 1/3] Fixed skipifs for connres --- test/functional/pdo_sqlsrv/skipif_version_less_than_2k14.inc | 4 ++++ test/functional/sqlsrv/skipif_version_less_than_2k14.inc | 4 ++++ 2 files changed, 8 insertions(+) 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 10849b9b2..9e6846df3 100644 --- a/test/functional/pdo_sqlsrv/skipif_version_less_than_2k14.inc +++ b/test/functional/pdo_sqlsrv/skipif_version_less_than_2k14.inc @@ -24,6 +24,10 @@ if (!$is_win) { if ($msodbcsql_maj < 17 or $msodbcsql_min < 2) { die("skip Unsupported ODBC driver version"); } +} else { + if ($msodbcsql_maj < 17) { + die("skip Unsupported ODBC driver version"); + } } // Get SQL Server Version diff --git a/test/functional/sqlsrv/skipif_version_less_than_2k14.inc b/test/functional/sqlsrv/skipif_version_less_than_2k14.inc index 74d041fff..3e0a58f7e 100644 --- a/test/functional/sqlsrv/skipif_version_less_than_2k14.inc +++ b/test/functional/sqlsrv/skipif_version_less_than_2k14.inc @@ -26,6 +26,10 @@ if (!$is_win) { if ($msodbcsql_maj < 17 or $msodbcsql_min < 2) { die("skip Unsupported ODBC driver version"); } +} else { + if ($msodbcsql_maj < 17) { + die("skip Unsupported ODBC driver version"); + } } // Get SQL Server version From efde09f9afc7788bc53b1ef67b9ffc215d9a7e2f Mon Sep 17 00:00:00 2001 From: David Puglielli Date: Mon, 23 Jul 2018 16:38:24 -0700 Subject: [PATCH 2/3] Tweaked per review comments --- .../functional/pdo_sqlsrv/skipif_version_less_than_2k14.inc | 6 +++++- test/functional/sqlsrv/skipif_version_less_than_2k14.inc | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) 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 9e6846df3..9f37d93c0 100644 --- a/test/functional/pdo_sqlsrv/skipif_version_less_than_2k14.inc +++ b/test/functional/pdo_sqlsrv/skipif_version_less_than_2k14.inc @@ -21,8 +21,12 @@ $msodbcsql_maj = explode(".", $msodbcsql_ver)[0]; $msodbcsql_min = explode(".", $msodbcsql_ver)[1]; if (!$is_win) { - if ($msodbcsql_maj < 17 or $msodbcsql_min < 2) { + if ($msodbcsql_maj < 17) { die("skip Unsupported ODBC driver version"); + } else { + if ($msodbcsql_maj==17 && $msodbcsql_min < 2) { + die("skip Unsupported ODBC driver version"); + } } } else { if ($msodbcsql_maj < 17) { diff --git a/test/functional/sqlsrv/skipif_version_less_than_2k14.inc b/test/functional/sqlsrv/skipif_version_less_than_2k14.inc index 3e0a58f7e..d70e4085e 100644 --- a/test/functional/sqlsrv/skipif_version_less_than_2k14.inc +++ b/test/functional/sqlsrv/skipif_version_less_than_2k14.inc @@ -23,8 +23,12 @@ $msodbcsql_maj = explode(".", $msodbcsql_ver)[0]; $msodbcsql_min = explode(".", $msodbcsql_ver)[1]; if (!$is_win) { - if ($msodbcsql_maj < 17 or $msodbcsql_min < 2) { + if ($msodbcsql_maj < 17) { die("skip Unsupported ODBC driver version"); + } else { + if ($msodbcsql_maj==17 && $msodbcsql_min < 2) { + die("skip Unsupported ODBC driver version"); + } } } else { if ($msodbcsql_maj < 17) { From 7357a1673f79b79c072483179dd70f34d9a0e928 Mon Sep 17 00:00:00 2001 From: David Puglielli Date: Thu, 26 Jul 2018 16:08:58 -0700 Subject: [PATCH 3/3] One more fix --- test/functional/pdo_sqlsrv/skipif_version_less_than_2k14.inc | 4 ---- test/functional/sqlsrv/skipif_version_less_than_2k14.inc | 4 ---- 2 files changed, 8 deletions(-) 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 9f37d93c0..7db45126b 100644 --- a/test/functional/pdo_sqlsrv/skipif_version_less_than_2k14.inc +++ b/test/functional/pdo_sqlsrv/skipif_version_less_than_2k14.inc @@ -28,10 +28,6 @@ if (!$is_win) { die("skip Unsupported ODBC driver version"); } } -} else { - if ($msodbcsql_maj < 17) { - die("skip Unsupported ODBC driver version"); - } } // Get SQL Server Version diff --git a/test/functional/sqlsrv/skipif_version_less_than_2k14.inc b/test/functional/sqlsrv/skipif_version_less_than_2k14.inc index d70e4085e..0ea10964c 100644 --- a/test/functional/sqlsrv/skipif_version_less_than_2k14.inc +++ b/test/functional/sqlsrv/skipif_version_less_than_2k14.inc @@ -30,10 +30,6 @@ if (!$is_win) { die("skip Unsupported ODBC driver version"); } } -} else { - if ($msodbcsql_maj < 17) { - die("skip Unsupported ODBC driver version"); - } } // Get SQL Server version