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

FIX Throw Exception instead of user_error when failing to select schema or connect to DB

Browse Source
This commit is contained in:
Robbie Averill 2017-11-30 15:15:20 +13:00
parent a401f7ad24
commit 276ee9aab2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/PostgreSQLDatabase.php
View File

@ -306,6 +306,7 @@ class PostgreSQLDatabase extends Database
* @param int|boolean $errorLevel The level of error reporting to enable for * @param int|boolean $errorLevel The level of error reporting to enable for
* the query, or false if no error should be raised * the query, or false if no error should be raised
* @return boolean Flag indicating success * @return boolean Flag indicating success
* @throws Exception If the schema doesn't exist
*/ */
public function setSchema($schema, $create = false, $errorLevel = E_USER_ERROR) public function setSchema($schema, $create = false, $errorLevel = E_USER_ERROR)
{ {
@ -313,7 +314,7 @@ class PostgreSQLDatabase extends Database
// Check DB creation permisson // Check DB creation permisson
if (!$create) { if (!$create) {
if ($errorLevel !== false) { if ($errorLevel !== false) {
user_error("Schema $schema does not exist", $errorLevel); throw new Exception("Schema $schema does not exist");
} }
$this->schema = null; $this->schema = null;
return false; return false;
@ -756,7 +757,7 @@ class PostgreSQLDatabase extends Database
// Check DB creation permisson // Check DB creation permisson
if (!$create) { if (!$create) {
if ($errorLevel !== false) { if ($errorLevel !== false) {
user_error("Attempted to connect to non-existing database \"$name\"", $errorLevel); throw new Exception('Attempted to connect to non-existing database "$name"');
} }
// Unselect database // Unselect database
$this->connector->unloadDatabase(); $this->connector->unloadDatabase();