diff --git a/_config/connectors.yml b/_config/connectors.yml index 250ddfe..567171f 100644 --- a/_config/connectors.yml +++ b/_config/connectors.yml @@ -1,7 +1,7 @@ --- name: mssqlconnectors --- -Injector: +SilverStripe\Core\Injector\Injector: # Connect using PDO MSSQLPDODatabase: class: 'SilverStripe\MSSQL\MSSQLDatabase' diff --git a/code/MSSQLDatabase.php b/code/MSSQLDatabase.php index 9dc196c..02f3e92 100644 --- a/code/MSSQLDatabase.php +++ b/code/MSSQLDatabase.php @@ -2,7 +2,8 @@ namespace SilverStripe\MSSQL; -use SilverStripe\Core\Config\Config; +use SilverStripe\Core\Config\Configurable; +use SilverStripe\Core\Injector\Injectable; use SilverStripe\Core\ClassInfo; use SilverStripe\ORM\ArrayList; use SilverStripe\ORM\Connect\Database; @@ -51,6 +52,8 @@ use SilverStripe\ORM\Queries\SQLSelect; */ class MSSQLDatabase extends Database { + use Configurable; + use Injectable; /** * Words that will trigger an error if passed to a SQL Server fulltext search @@ -83,7 +86,7 @@ class MSSQLDatabase extends Database */ public static function set_collation($collation) { - Config::inst()->update('SilverStripe\\MSSQL\\MSSQLDatabase', 'collation', $collation); + static::config()->set('collation', $collation); } /** @@ -95,7 +98,7 @@ class MSSQLDatabase extends Database */ public static function get_collation() { - return Config::inst()->get('SilverStripe\\MSSQL\\MSSQLDatabase', 'collation'); + return static::config()->get('collation'); } /** diff --git a/composer.json b/composer.json index c34599c..8c016a4 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "silverstripe/mssql", "description": "Adds MSSQL support to SilverStripe", - "type": "silverstripe-module", + "type": "silverstripe-vendormodule", "keywords": ["silverstripe", "mssql", "database"], "authors": [ { @@ -16,6 +16,10 @@ "require": { "silverstripe/framework": "^4" }, + "suggest": { + "ext-sqlsrv": "Required to support MSSQLDatabase as the server type", + "ext-pdo_sqlsrv": "Required to support MSSQLPDODatabase as the server type" + }, "extra": { "branch-alias": { "dev-master": "2.x-dev"