mirror of
https://github.com/silverstripe/silverstripe-sqlite3
synced 2024-09-29 04:39:06 +02:00
MINOR Fixed SS_DATABASE_CLASS not working if set to something else in sqlite3 config
This commit is contained in:
parent
7360cd57a7
commit
c39c78d148
16
_config.php
16
_config.php
@ -1,10 +1,13 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
$classes = array('SQLiteDatabase', 'SQLite3Database', 'SQLitePDODatabase');
|
||||||
|
|
||||||
global $databaseConfig;
|
global $databaseConfig;
|
||||||
if(defined('SS_DATABASE_CLASS')) $databaseConfig['type'] = SS_DATABASE_CLASS;
|
if(defined('SS_DATABASE_CLASS') && in_array(SS_DATABASE_CLASS, $classes)) {
|
||||||
|
$databaseConfig['type'] = SS_DATABASE_CLASS;
|
||||||
if(array_search($databaseConfig['type'], array('SQLiteDatabase', 'SQLite3Database', 'SQLitePDODatabase')) !== false) {
|
}
|
||||||
|
|
||||||
|
if(in_array($databaseConfig['type'], $classes)) {
|
||||||
if(empty($databaseConfig['path'])) $databaseConfig['path'] = defined('SS_SQLITE_DATABASE_PATH') && SS_SQLITE_DATABASE_PATH ? SS_SQLITE_DATABASE_PATH : ASSETS_PATH . '/.sqlitedb/'; // where to put the database file
|
if(empty($databaseConfig['path'])) $databaseConfig['path'] = defined('SS_SQLITE_DATABASE_PATH') && SS_SQLITE_DATABASE_PATH ? SS_SQLITE_DATABASE_PATH : ASSETS_PATH . '/.sqlitedb/'; // where to put the database file
|
||||||
$databaseConfig['database'] = (defined('SS_DATABASE_PREFIX') ? SS_DATABASE_PREFIX : '') . $databaseConfig['database'] . (defined('SS_DATABASE_SUFFIX') ? SS_DATABASE_SUFFIX : '');
|
$databaseConfig['database'] = (defined('SS_DATABASE_PREFIX') ? SS_DATABASE_PREFIX : '') . $databaseConfig['database'] . (defined('SS_DATABASE_SUFFIX') ? SS_DATABASE_SUFFIX : '');
|
||||||
if(!isset($databaseConfig['memory'])) $databaseConfig['memory'] = true; // run tests in memory
|
if(!isset($databaseConfig['memory'])) $databaseConfig['memory'] = true; // run tests in memory
|
||||||
@ -20,10 +23,9 @@ if(array_search($databaseConfig['type'], array('SQLiteDatabase', 'SQLite3Databas
|
|||||||
);
|
);
|
||||||
|
|
||||||
// The SQLite3 class is available in PHP 5.3 and newer
|
// The SQLite3 class is available in PHP 5.3 and newer
|
||||||
if($databaseConfig['type'] == 'SQLitePDODatabase' || !class_exists('SQLite3')) {
|
if(class_exists('SQLite3') && $databaseConfig['type'] == 'SQLite3Database') {
|
||||||
$databaseConfig['type'] = 'SQLitePDODatabase';
|
|
||||||
} else {
|
|
||||||
$databaseConfig['type'] = 'SQLite3Database';
|
$databaseConfig['type'] = 'SQLite3Database';
|
||||||
|
} else {
|
||||||
|
$databaseConfig['type'] = 'SQLitePDODatabase';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user