From c39c78d148e7fe02c75ec5750facebbbacab4e73 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Fri, 12 Mar 2010 02:37:17 +0000
Subject: [PATCH] MINOR Fixed SS_DATABASE_CLASS not working if set to something
 else in sqlite3 config

---
 _config.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/_config.php b/_config.php
index 30fae52..072f2bb 100644
--- a/_config.php
+++ b/_config.php
@@ -1,10 +1,13 @@
 <?php
 
+$classes = array('SQLiteDatabase', 'SQLite3Database', 'SQLitePDODatabase');
+
 global $databaseConfig;
-if(defined('SS_DATABASE_CLASS')) $databaseConfig['type'] = SS_DATABASE_CLASS;
-
-if(array_search($databaseConfig['type'], array('SQLiteDatabase', 'SQLite3Database', 'SQLitePDODatabase')) !== false) {
+if(defined('SS_DATABASE_CLASS') && in_array(SS_DATABASE_CLASS, $classes)) {
+	$databaseConfig['type'] = SS_DATABASE_CLASS;
+}
 
+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
 	$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
@@ -20,10 +23,9 @@ if(array_search($databaseConfig['type'], array('SQLiteDatabase', 'SQLite3Databas
 	);
 
 	// The SQLite3 class is available in PHP 5.3 and newer
-	if($databaseConfig['type'] == 'SQLitePDODatabase' || !class_exists('SQLite3')) {
-		$databaseConfig['type'] = 'SQLitePDODatabase';
-	} else {
+	if(class_exists('SQLite3') && $databaseConfig['type'] == 'SQLite3Database') {
 		$databaseConfig['type'] = 'SQLite3Database';
+	} else {
+		$databaseConfig['type'] = 'SQLitePDODatabase';
 	}
-}
-
+}
\ No newline at end of file