From 267271e0b683359237b4d09ce5fdfdd1746188c5 Mon Sep 17 00:00:00 2001
From: yitam <v-yitam@microsoft.com>
Date: Tue, 20 Jun 2017 17:15:48 -0700
Subject: [PATCH] fix ExtensionVer regex

---
 test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt   | 2 +-
 test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt     | 2 +-
 test/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt | 2 +-
 test/pdo_sqlsrv/pdo_get_set_attr.phpt            | 2 +-
 test/sqlsrv/sqlsrv_2008_dataTypes.phpt           | 2 +-
 test/sqlsrv/sqlsrv_client_info.phpt              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt
index a134c797..d299859a 100644
--- a/test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt
+++ b/test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt
@@ -35,5 +35,5 @@ Array
     \[DriverDllName\] => msodbcsql[0-9]{2}\.dll|libmsodbcsql-[0-9]{2}\.[0-9]\.so\.[0-9]\.[0-9]
     \[DriverODBCVer\] => [0-9]{1,2}\.[0-9]{1,2}
     \[DriverVer\] => [0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4}
-    \[ExtensionVer\] => [0-9]\.[0-9]\.[0-9](\-((rc)|(preview))(\.[0-9]+)?)?(\+[0-9]+)?
+    \[ExtensionVer\] => [0-9]\.[0-9]\.[0-9](\-((RC[1-9]?)|(preview[1-9]?))(\.[0-9]+)?)?(\+[0-9]+)?
 \)
\ No newline at end of file
diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt
index b0d42566..f0953983 100644
--- a/test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt
+++ b/test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt
@@ -32,4 +32,4 @@ sqlsrv_close( $conn);
 DriverDllName: msodbcsql[0-9]{2}\.dll|libmsodbcsql-[0-9]{2}\.[0-9]\.so\.[0-9]\.[0-9]
 DriverODBCVer: [0-9]{1,2}\.[0-9]{1,2}
 DriverVer: [0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4}
-ExtensionVer: [0-9]\.[0-9]\.[0-9](\-((rc)|(preview))(\.[0-9]+)?)?(\+[0-9]+)?
\ No newline at end of file
+ExtensionVer: [0-9]\.[0-9]\.[0-9](\-((RC[1-9]?)|(preview[1-9]?))(\.[0-9]+)?)?(\+[0-9]+)?
\ No newline at end of file
diff --git a/test/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt b/test/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt
index a27ddcde..8bfd0e55 100644
--- a/test/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt
+++ b/test/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt
@@ -18,5 +18,5 @@ Array
     \[(DriverDllName|DriverName)\] => (msodbcsql1[1-9].dll|libmsodbcsql-[1-9]{2}.[0-9].so.[0-9].[0-9])
     \[DriverODBCVer\] => [0-9]{1,2}\.[0-9]{1,2}
     \[DriverVer\] => [0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4}
-    \[ExtensionVer\] => [0-9]\.[0-9]\.[0-9](\-((rc)|(preview))(\.[0-9]+)?)?(\+[0-9]+)?
+    \[ExtensionVer\] => [0-9]\.[0-9]\.[0-9](\-((RC[1-9]?)|(preview[1-9]?))(\.[0-9]+)?)?(\+[0-9]+)?
 \)
\ No newline at end of file
diff --git a/test/pdo_sqlsrv/pdo_get_set_attr.phpt b/test/pdo_sqlsrv/pdo_get_set_attr.phpt
index 7651b479..499bcbf2 100644
--- a/test/pdo_sqlsrv/pdo_get_set_attr.phpt
+++ b/test/pdo_sqlsrv/pdo_get_set_attr.phpt
@@ -145,7 +145,7 @@ array\(4\) {
   \["DriverVer"\]=>
   string\(10\) "[0-9]{2}.[0-9]{2}.[0-9]{4}"
   \["ExtensionVer"\]=>
-  string\([0-9]*\) \"[0-9]\.[0-9]\.[0-9](\-((rc)|(preview))(\.[0-9]+)?)?(\+[0-9]+)?\"
+  string\([0-9]*\) \"[0-9]\.[0-9]\.[0-9](\-((RC[1-9]?)|(preview[1-9]?))(\.[0-9]+)?)?(\+[0-9]+)?\"
 }
 
 Test_6:
diff --git a/test/sqlsrv/sqlsrv_2008_dataTypes.phpt b/test/sqlsrv/sqlsrv_2008_dataTypes.phpt
index 2b7a1f89..48740a18 100644
--- a/test/sqlsrv/sqlsrv_2008_dataTypes.phpt
+++ b/test/sqlsrv/sqlsrv_2008_dataTypes.phpt
@@ -109,7 +109,7 @@ Array
     \[(DriverDllName|DriverName)\] => msodbcsql[0-9]{2}\.dll|libmsodbcsql-[0-9]{2}\.[0-9]\.so\.[0-9]\.[0-9]
     \[DriverODBCVer\] => [0-9]{1,2}\.[0-9]{1,2}
     \[DriverVer\] => [0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4}
-    \[ExtensionVer\] => [0-9]\.[0-9]\.[0-9](\-((rc)|(preview))(\.[0-9]+)?)?(\+[0-9]+)?
+    \[ExtensionVer\] => [0-9]\.[0-9]\.[0-9](\-((RC[1-9]?)|(preview[1-9]?))(\.[0-9]+)?)?(\+[0-9]+)?
 \)
 field 0 = [0-9]{1,5}
 field 1 = [0-9]{4}\-[0-9]{2}\-[0-9]{2}
diff --git a/test/sqlsrv/sqlsrv_client_info.phpt b/test/sqlsrv/sqlsrv_client_info.phpt
index 3eb80627..54222ab1 100644
--- a/test/sqlsrv/sqlsrv_client_info.phpt
+++ b/test/sqlsrv/sqlsrv_client_info.phpt
@@ -21,5 +21,5 @@ array\(4\) {
   \[\"DriverVer\"\]=>
   string\(10\) \"[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4}\"
   \[\"ExtensionVer\"\]=>
-  string\([0-9]+\) \"[0-9]\.[0-9]\.[0-9](\-((rc)|(preview))(\.[0-9]+)?)?(\+[0-9]+)?"
+  string\([0-9]+\) \"[0-9]\.[0-9]\.[0-9](\-((RC[1-9]?)|(preview[1-9]?))(\.[0-9]+)?)?(\+[0-9]+)?\"
 }
\ No newline at end of file