FIX Silverstripe expects dates as strings

silverstripe · Oct 13, 2020 · 0cc9a14 · 0cc9a14
1 parent cc80227
commit 0cc9a14
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/MSSQLAzureDatabase.php b/src/MSSQLAzureDatabase.php
@@ -57,6 +57,7 @@ protected function connectDatabase($database)
     {
         $parameters = $this->parameters;
         $parameters['database'] = $database;
+        $parameters['returndatesasstrings'] = 1;
         $parameters['multipleactiveresultsets'] = 1;
 
         // Ensure that driver is available (required by PDO)

diff --git a/src/MSSQLDatabaseConfigurationHelper.php b/src/MSSQLDatabaseConfigurationHelper.php
@@ -45,7 +45,8 @@ protected function createConnection($databaseConfig, &$error)
                     // Azure has additional parameter requirements
                     if ($this->isAzure($databaseConfig)) {
                         $parameters['database'] = $databaseConfig['database'];
-                        $parameters['multipleactiveresultsets'] = 0;
+                        $parameters['multipleactiveresultsets'] = 1;
+                        $parameters['returndatesasstrings'] = 1;
                     }
 
                     $conn = @sqlsrv_connect($databaseConfig['server'], $parameters);

diff --git a/src/SQLServerConnector.php b/src/SQLServerConnector.php
@@ -47,13 +47,16 @@ public function connect($parameters, $selectDB = false)
         }
 
         $charset = isset($parameters['charset']) ? $parameters : 'UTF-8';
-        $multiResultSets = isset($parameters['multipleactiveresultsets'])
-                ? $parameters['multipleactiveresultsets']
-                : true;
-        $options = array(
+
+        $options = [
             'CharacterSet' => $charset,
-            'MultipleActiveResultSets' => $multiResultSets
-        );
+            'ReturnDatesAsStrings' => isset($parameters['returndatesasstrings'])
+                ? $parameters['returndatesasstrings']
+                : true,
+            'MultipleActiveResultSets' => isset($parameters['multipleactiveresultsets'])
+                ? $parameters['multipleactiveresultsets']
+                : true
+        ];
 
         if (!(defined('MSSQL_USE_WINDOWS_AUTHENTICATION') && MSSQL_USE_WINDOWS_AUTHENTICATION == true)
             && empty($parameters['windowsauthentication'])