Merge branch '2.1' into 2

This commit is contained in:
Robbie Averill 2019-01-09 09:35:00 +01:00
commit 10c85d4179

View File

@ -5,28 +5,28 @@ SilverStripe\Core\Injector\Injector:
SQLite3PDODatabase: SQLite3PDODatabase:
class: SilverStripe\SQLite\SQLite3Database class: SilverStripe\SQLite\SQLite3Database
properties: properties:
connector: %$PDOConnector connector: '%$PDOConnector'
schemaManager: %$SQLite3SchemaManager schemaManager: '%$SQLite3SchemaManager'
queryBuilder: %$SQLite3QueryBuilder queryBuilder: '%$SQLite3QueryBuilder'
SQLite3Database: SQLite3Database:
class: SilverStripe\SQLite\SQLite3Database class: SilverStripe\SQLite\SQLite3Database
properties: properties:
connector: %$SQLite3Connector connector: '%$SQLite3Connector'
schemaManager: %$SQLite3SchemaManager schemaManager: '%$SQLite3SchemaManager'
queryBuilder: %$SQLite3QueryBuilder queryBuilder: '%$SQLite3QueryBuilder'
# Legacy connector names # Legacy connector names
SQLiteDatabase: SQLiteDatabase:
class: SilverStripe\SQLite\SQLite3Database class: SilverStripe\SQLite\SQLite3Database
properties: properties:
connector: %$SQLite3Connector connector: '%$SQLite3Connector'
schemaManager: %$SQLite3SchemaManager schemaManager: '%$SQLite3SchemaManager'
queryBuilder: %$SQLite3QueryBuilder queryBuilder: '%$SQLite3QueryBuilder'
SQLitePDODatabase: SQLitePDODatabase:
class: SilverStripe\SQLite\SQLite3Database class: SilverStripe\SQLite\SQLite3Database
properties: properties:
connector: %$SQLite3Connector connector: '%$SQLite3Connector'
schemaManager: %$SQLite3SchemaManager schemaManager: '%$SQLite3SchemaManager'
queryBuilder: %$SQLite3QueryBuilder queryBuilder: '%$SQLite3QueryBuilder'
SQLite3Connector: SQLite3Connector:
class: SilverStripe\SQLite\SQLite3Connector class: SilverStripe\SQLite\SQLite3Connector
type: prototype type: prototype