tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-10-22 15:05:33 +00:00
Code Issues Projects Releases Wiki Activity

MINOR Updated registered databases in installer from changes to DatabaseRegistry in r100898 (from r100899)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112208 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
sminnee 2010-10-13 04:25:30 +00:00
parent 3f34c41315
commit 51d4836bda
1 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
install.php
View File

@ -70,42 +70,49 @@ if(isset($_SERVER['HTTP_USER_AGENT'])) {
// Register the SilverStripe provided databases
DatabaseAdapterRegistry::register(
'MySQLDatabase',
'MySQL 4.1+',
'sapphire/dev/install/MySQLDatabaseConfigurationHelper.php',
function_exists('mysql_connect')
array(
'class' => 'MySQLDatabase',
'title' => 'MySQL 4.1+',
'helperPath' => 'sapphire/dev/install/MySQLDatabaseConfigurationHelper.php',
'supported' => function_exists('mysql_connect')
)
);
DatabaseAdapterRegistry::register(
'MSSQLDatabase',
'SQL Server 2008',
'mssql/code/MSSQLDatabaseConfigurationHelper.php',
function_exists('mssql_connect') || function_exists('sqlsrv_connect'),
null,
'Neither the <a href="http://php.net/mssql">mssql</a> or <a href="http://www.microsoft.com/sqlserver/2005/en/us/PHP-Driver.aspx">sqlsrv</a> PHP extensions are available. Please install or enable one of them and refresh this page.'
array(
'class' => 'MSSQLDatabase',
'title' => 'SQL Server 2008',
'helperPath' => 'mssql/code/MSSQLDatabaseConfigurationHelper.php',
'supported' => (function_exists('mssql_connect') || function_exists('sqlsrv_connect')),
'missingExtensionText' => 'Neither the <a href="http://php.net/mssql">mssql</a> or <a href="http://www.microsoft.com/sqlserver/2005/en/us/PHP-Driver.aspx">sqlsrv</a> PHP extensions are available. Please install or enable one of them and refresh this page.'
)
);
DatabaseAdapterRegistry::register(
'PostgreSQLDatabase',
'PostgreSQL 8.3+',
'postgresql/code/PostgreSQLDatabaseConfigurationHelper.php',
function_exists('pg_query'),
null,
'The <a href="http://php.net/pgsql">pgsql</a> PHP extension is not available. Please install or enable it and refresh this page.'
array(
'class' => 'PostgreSQLDatabase',
'title' => 'PostgreSQL 8.3+',
'helperPath' => 'postgresql/code/PostgreSQLDatabaseConfigurationHelper.php',
'supported' => function_exists('pg_query'),
'missingExtensionText' => 'The <a href="http://php.net/pgsql">pgsql</a> PHP extension is not available. Please install or enable it and refresh this page.'
)
);
DatabaseAdapterRegistry::register(
'SQLite3Database',
'SQLite 3.3+',
'sqlite3/code/SQLiteDatabaseConfigurationHelper.php',
class_exists('SQLite3') || class_exists('PDO'),
null,
'The <a href="http://php.net/manual/en/book.sqlite3.php">SQLite3</a> and <a href="http://php.net/manual/en/book.pdo.php">PDO</a> classes are not available. Please install or enable them and refresh this page.');
array(
'class' => 'SQLite3Database',
'title' => 'SQLite 3.3+',
'helperPath' => 'sqlite3/code/SQLiteDatabaseConfigurationHelper.php',
'supported' => (class_exists('SQLite3') || class_exists('PDO')),
'missingExtensionText' => 'The <a href="http://php.net/manual/en/book.sqlite3.php">SQLite3</a> and <a href="http://php.net/manual/en/book.pdo.php">PDO</a> classes are not available. Please install or enable them and refresh this page.'
)
);
// Discover any 3rd party ones
DatabaseAdapterRegistry::autodiscover();
// Determine which external database modules are USABLE
foreach(DatabaseAdapterRegistry::adapters() as $class => $details) {
foreach(DatabaseAdapterRegistry::get_adapters() as $class => $details) {
$databaseClasses[$class] = $details;
if(file_exists($details['helperPath'])) {
$databaseClasses[$class]['hasModule'] = true;
@ -638,7 +645,7 @@ class InstallRequirements {
* @param string $databaseClass e.g. MySQLDatabase or MSSQLDatabase
*/
function getDatabaseConfigurationHelper($databaseClass) {
$adapters = DatabaseAdapterRegistry::adapters();
$adapters = DatabaseAdapterRegistry::get_adapters();
if(isset($adapters[$databaseClass])) {
$helperPath = $adapters[$databaseClass]['helperPath'];
$class = str_replace('.php', '', basename($helperPath));