diff --git a/_register_database.php b/_register_database.php
index 601fa55..2a91a1e 100644
--- a/_register_database.php
+++ b/_register_database.php
@@ -7,8 +7,10 @@ use SilverStripe\MSSQL\MSSQLDatabaseConfigurationHelper;
/** @skipUpgrade */
DatabaseAdapterRegistry::register(array(
'class' => 'MSSQLPDODatabase',
+ 'module' => 'mssql',
'title' => 'SQL Server 2008 (using PDO)',
- 'helperPath' => dirname(__FILE__).'/code/MSSQLDatabaseConfigurationHelper.php',
+ 'helperPath' => __DIR__.'/code/MSSQLDatabaseConfigurationHelper.php',
+ 'helperClass' => MSSQLDatabaseConfigurationHelper::class,
'supported' => !!MSSQLDatabaseConfigurationHelper::getPDODriver(),
'missingExtensionText' =>
'Either the PDO Extension or
@@ -20,8 +22,10 @@ DatabaseAdapterRegistry::register(array(
/** @skipUpgrade */
DatabaseAdapterRegistry::register(array(
'class' => 'MSSQLDatabase',
+ 'module' => 'mssql',
'title' => 'SQL Server 2008 (using sqlsrv)',
- 'helperPath' => dirname(__FILE__).'/code/MSSQLDatabaseConfigurationHelper.php',
+ 'helperPath' => __DIR__.'/code/MSSQLDatabaseConfigurationHelper.php',
+ 'helperClass' => MSSQLDatabaseConfigurationHelper::class,
'supported' => function_exists('sqlsrv_connect'),
'missingExtensionText' =>
'The sqlsrv
@@ -39,8 +43,10 @@ DatabaseAdapterRegistry::register(array(
/** @skipUpgrade */
DatabaseAdapterRegistry::register(array(
'class' => 'MSSQLAzureDatabase',
+ 'module' => 'mssql',
'title' => 'MS Azure Database (using sqlsrv)',
- 'helperPath' => dirname(__FILE__).'/code/MSSQLDatabaseConfigurationHelper.php',
+ 'helperPath' => __DIR__.'/code/MSSQLDatabaseConfigurationHelper.php',
+ 'helperClass' => MSSQLDatabaseConfigurationHelper::class,
'supported' => function_exists('sqlsrv_connect'),
'missingExtensionText' =>
'The sqlsrv
diff --git a/code/MSSQLDatabaseConfigurationHelper.php b/code/MSSQLDatabaseConfigurationHelper.php
index 8749f3e..1bdc8eb 100644
--- a/code/MSSQLDatabaseConfigurationHelper.php
+++ b/code/MSSQLDatabaseConfigurationHelper.php
@@ -25,6 +25,7 @@ class MSSQLDatabaseConfigurationHelper implements DatabaseConfigurationHelper
/**
* Create a connection of the appropriate type
*
+ * @skipUpgrade
* @param array $databaseConfig
* @param string $error Error message passed by value
* @return mixed|null Either the connection object, or null if error
@@ -32,7 +33,6 @@ class MSSQLDatabaseConfigurationHelper implements DatabaseConfigurationHelper
protected function createConnection($databaseConfig, &$error)
{
$error = null;
- /** @skipUpgrade */
try {
switch ($databaseConfig['type']) {
case 'MSSQLDatabase':
@@ -78,7 +78,7 @@ class MSSQLDatabaseConfigurationHelper implements DatabaseConfigurationHelper
return null;
}
default:
- $error = 'Invalid connection type';
+ $error = 'Invalid connection type: ' . $databaseConfig['type'];
return null;
}
} catch (Exception $ex) {