Fixed sqlsrv datetime tests to connect with ColumnEncryption variables (

#849)
microsoft · Sep 21, 2018 · 0ba11a2 · 0ba11a2
1 parent 88dfea3
commit 0ba11a2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/test/functional/sqlsrv/sqlsrv_statement_datetimes_as_nulls.phpt b/test/functional/sqlsrv/sqlsrv_statement_datetimes_as_nulls.phpt
@@ -81,7 +81,7 @@ function createTestTable($conn, $tableName, $columns)
 function runTest($tableName, $columns, $dateAsString)
 {
     // Connect
-    $conn = connect(array('ReturnDatesAsStrings' => $dateAsString));
+    $conn = AE\connect(array('ReturnDatesAsStrings' => $dateAsString));
     if (!$conn) {
         fatalError("Could not connect.\n");
     }
@@ -100,7 +100,7 @@ $tableName = "TestNullDateTime";
 $columns = array('c1', 'c2', 'c3', 'c4', 'c5', 'c6');
 
 // Connect
-$conn = connect();
+$conn = AE\connect();
 if (!$conn) {
     fatalError("Could not connect.\n");
 }

diff --git a/test/functional/sqlsrv/sqlsrv_statement_datetimes_as_strings.phpt b/test/functional/sqlsrv/sqlsrv_statement_datetimes_as_strings.phpt
@@ -139,6 +139,11 @@ $query = 'SELECT CONVERT(date, SYSDATETIME()), SYSDATETIME(),
                  CONVERT(time, SYSDATETIME())';
 $stmt = sqlsrv_query($conn, $query);
 $values = sqlsrv_fetch_array($stmt, SQLSRV_FETCH_NUMERIC);
+sqlsrv_free_stmt($stmt);
+sqlsrv_close($conn);
+
+// Connect again with ColumnEncryption data
+$conn = AE\connect(array('ReturnDatesAsStrings' => true));
 
 // Create the test table of date and time columns
 $tableName = 'StmtDateAsString';
@@ -176,7 +181,7 @@ testStmtOption($conn, $tableName, $values, false);
 sqlsrv_close($conn);
 
 // Now connect but with ReturnDatesAsStrings option set to false
-$conn = connect(array('ReturnDatesAsStrings' => false));
+$conn = AE\connect(array('ReturnDatesAsStrings' => false));
 if (!$conn) {
     fatalError("Could not connect.\n");
 }

diff --git a/test/functional/sqlsrv/sqlsrv_statement_datetimes_output_param.phpt b/test/functional/sqlsrv/sqlsrv_statement_datetimes_output_param.phpt
@@ -58,6 +58,15 @@ $query = 'SELECT CONVERT(date, SYSDATETIME()), SYSDATETIME(), SYSDATETIMEOFFSET(
 $stmt = sqlsrv_query($conn, $query);
 $values = sqlsrv_fetch_array($stmt, SQLSRV_FETCH_NUMERIC);
 
+sqlsrv_free_stmt($stmt);
+sqlsrv_close($conn);
+
+// Connect again with ColumnEncryption data
+$conn = AE\connect(array('ReturnDatesAsStrings' => true));
+if (!$conn) {
+    fatalError("Could not connect.\n");
+}
+
 // Create the test table of date and time columns
 $tableName = 'OuputParamDateAsString';
 $columns = array('c1', 'c2', 'c3', 'c4');