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

Merged revisions 47698 via svnmerge from

Browse Source 
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/events

........
  r47698 | sminnee | 2008-01-08 12:11:08 +1300 (Tue, 08 Jan 2008) | 1 line
  
  PDODatabase got the wrong end of the stick - Database::createDatabase() shouldn't need any arguments.  Fixed this in the core class and MySQLDatabase, but PDODatabse still needs fixing.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47710 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2008-01-08 02:14:05 +00:00
parent 5606e9278b
commit 3ce88a07d9
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/model/Database.php
View File

@ -49,13 +49,13 @@ abstract class Database extends Object {
* Create the database and connect to it. This can be called if the
* initial database connection is not successful because the database
* does not exist.
* @param string $connect Connection string
* @param string $username Database username
* @param string $password Database Password
* @param string $database Database to which to create
*
* It takes no parameters, and should create the database from the information
* specified in the constructor.
*
* @return boolean Returns true if successful
*/
abstract function createDatabase($connect, $username, $password, $database);
abstract function createDatabase();
/**
* Build the connection string from input

2
core/model/MySQLDatabase.php
View File

@ -127,7 +127,7 @@ class MySQLDatabase extends Database {
return $this->active ? true : false;
}
public function createDatabase($connect, $username, $password, $db) {
public function createDatabase() {
$this->query("CREATE DATABASE $this->database");
$this->query("USE $this->database");

4
core/model/PDODatabase.php
View File

@ -58,6 +58,7 @@ class PDODatabase extends Database {
try { // Try connect to the database, if it does not exist, create it
$this->dbConn = new PDO($connectWithDB, $parameters['username'], $parameters['password']);
} catch (PDOException $e) {
// To do - this is an instance method, not a static method. Call it as such.
if (!self::createDatabase($connect, $parameters['username'], $parameters['password'], $parameters['database'])) {
$this->databaseError("Could not connect to the database, make sure the server is available and user credentials are correct");
} else {
@ -228,6 +229,7 @@ class PDODatabase extends Database {
* @param string $password Database Password
* @param string $database Database to which to create
* @return boolean Returns true if successful
* @todo This shouldn't take any arguments; it should take the information given in the constructor instead.
*/
public function createDatabase($connect, $username, $password, $database) {
try {
@ -713,4 +715,4 @@ class PDOQuery extends Query {
}
?>
?>