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

ENHANCEMENT Fixes to PostgreSQLDatabaseConfigurationHelper to support the installer changes in r99001

Browse Source
This commit is contained in:
Sean Harvey 2010-02-15 05:37:17 +00:00
parent 459d1ffe60
commit bcd163ff06
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/PostgreSQLDatabaseConfigurationHelper.php
View File

@ -83,6 +83,9 @@ class PostgreSQLDatabaseConfigurationHelper implements DatabaseConfigurationHelp
/**
* Ensure that the database connection is able to use an existing database,
* or be able to create one if it doesn't exist.
*
* Unfortunately, PostgreSQLDatabase doesn't support automatically creating databases
* at the moment, so we can only check that the chosen database exists.
*
* @param array $databaseConfig Associative array of db configuration, e.g. "server", "username" etc
* @return array Result - e.g. array('success' => true, 'alreadyExists' => 'true')
@ -90,6 +93,7 @@ class PostgreSQLDatabaseConfigurationHelper implements DatabaseConfigurationHelp
public function requireDatabaseOrCreatePermissions($databaseConfig) {
$success = false;
$alreadyExists = false;
$canCreate = false;
$check = $this->requireDatabaseConnection($databaseConfig);
$conn = $check['connection'];
@ -98,17 +102,13 @@ class PostgreSQLDatabaseConfigurationHelper implements DatabaseConfigurationHelp
if(pg_fetch_array($result)) {
$success = true;
$alreadyExists = true;
} else {
if(@pg_query($conn, "CREATE DATABASE testing123")) {
pg_query($conn, "DROP DATABASE testing123");
$success = true;
$alreadyExists = false;
}
$canCreate = true;
}
return array(
'success' => $success,
'alreadyExists' => $alreadyExists
'alreadyExists' => $alreadyExists,
'canCreate' => $canCreate
);
}