tonyair
/
silverstripe-postgresql
mirror of https://github.com/silverstripe/silverstripe-postgresql
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Better error handling and support passwords with spaces in them

This commit is contained in:
Simon Welsh 2013-12-20 14:34:31 +13:00
parent 65702e4a6b
commit b8771b79da
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/PostgreSQLDatabase.php
View File

@ -134,7 +134,7 @@ class PostgreSQLDatabase extends SS_Database {
return false;
($parameters['username']!='') ? $username=' user=' . $parameters['username'] : $username='';
($parameters['password']!='') ? $password=' password=' . $parameters['password'] : $password='';
($parameters['password']!='') ? $password=' password=\'' . $parameters['password'] . '\'' : $password='';
if(!isset($this->database))
$dbName=$parameters['database'];
@ -149,6 +149,8 @@ class PostgreSQLDatabase extends SS_Database {
if(!$this->dbConn) {
throw new ErrorException("Couldn't connect to PostgreSQL database");
} elseif(pg_connection_status($this->dbConn) != PGSQL_CONNECTION_OK) {
throw new ErrorException(pg_last_error($this->dbConn));
}
if(!$this->databaseExists($dbName)) {
@ -161,6 +163,8 @@ class PostgreSQLDatabase extends SS_Database {
if(!$this->dbConn) {
throw new ErrorException("Couldn't connect to PostgreSQL database");
} elseif(pg_connection_status($this->dbConn) != PGSQL_CONNECTION_OK) {
throw new ErrorException(pg_last_error($this->dbConn));
}
//By virtue of getting here, the connection is active:
@ -334,9 +338,7 @@ class PostgreSQLDatabase extends SS_Database {
* Returns true if the named database exists.
*/
public function databaseExists($name) {
// We have to use addslashes here, since there may not be a database connection to base the Convert::raw2sql
// function off.
$SQL_name=addslashes($name);
$SQL_name=$this->addslashes($name);
return $this->query("SELECT datname FROM pg_database WHERE datname='$SQL_name';")->first() ? true : false;
}
@ -1732,7 +1734,7 @@ class PostgreSQLDatabase extends SS_Database {
* Using PHP's addslashes method won't work in MSSQL
*/
function addslashes($value){
return pg_escape_string($value);
return pg_escape_string($this->dbConn, $value);
}
/*