Merge pull request #449 from yitam/extensionVer

fix ExtensionVer regex
microsoft · Jun 21, 2017 · f5be531 · f5be531
2 parents 1d1d285 + f1872d5
commit f5be531
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 14 deletions.
diff --git 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[0-9]?|preview))?(\.[0-9]+)?(\+[0-9]+)?
 \)
diff --git 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]+)?
+ExtensionVer: [0-9].[0-9]\.[0-9](-(RC[0-9]?|preview))?(\.[0-9]+)?(\+[0-9]+)?
diff --git 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[0-9]?|preview))?(\.[0-9]+)?(\+[0-9]+)?
 \)
diff --git 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[0-9]?|preview))?(\.[0-9]+)?(\+[0-9]+)?\"
 }
 
 Test_6:

diff --git a/test/sqlsrv/sqlsrv_2008_dataTypes.phpt b/test/sqlsrv/sqlsrv_2008_dataTypes.phpt
@@ -20,8 +20,6 @@ if( !$conn ) {
     FatalError("Could not connect");
 }
 
-print_r( sqlsrv_client_info( $conn ));
-
 $stmt = sqlsrv_query( $conn, "IF OBJECT_ID('2008_date_types', 'U') IS NOT NULL DROP TABLE [2008_date_types]" );
 
 $stmt = sqlsrv_query( $conn, "CREATE TABLE [2008_date_types] (id int, [c1_date] date, [c2_time] time, [c3_datetimeoffset] datetimeoffset, [c4_datetime2] datetime2)" );
@@ -104,13 +102,6 @@ sqlsrv_close( $conn );
 
 ?>
 --EXPECTREGEX--
-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]+)?
-\)
 field 0 = [0-9]{1,5}
 field 1 = [0-9]{4}\-[0-9]{2}\-[0-9]{2}
 field 2 = [0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]{7}

diff --git 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[0-9]?|preview))?(\.[0-9]+)?(\+[0-9]+)?\"
 }