mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unneeded parameter in DatabaseException 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2017-07-24 13:44:12 +02:00
parent 989614f9d5
commit b8ed028870
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/private/DatabaseException.php
View File

@ -24,15 +24,4 @@
namespace OC; namespace OC;
class DatabaseException extends \Exception { class DatabaseException extends \Exception {
private $query;
//FIXME getQuery seems to be unused, maybe use parent constructor with $message, $code and $previous
public function __construct($message, $query = null){
parent::__construct($message);
$this->query = $query;
}
public function getQuery() {
return $this->query;
}
} }

4
lib/private/legacy/db.php
View File

@ -65,7 +65,7 @@ class OC_DB {
try { try {
$result =$connection->prepare($query, $limit, $offset); $result =$connection->prepare($query, $limit, $offset);
} catch (\Doctrine\DBAL\DBALException $e) { } catch (\Doctrine\DBAL\DBALException $e) {
throw new \OC\DatabaseException($e->getMessage(), $query); throw new \OC\DatabaseException($e->getMessage());
} }
// differentiate between query and manipulation // differentiate between query and manipulation
$result = new OC_DB_StatementWrapper($result, $isManipulation); $result = new OC_DB_StatementWrapper($result, $isManipulation);
@ -214,7 +214,7 @@ class OC_DB {
} else { } else {
$message .= ', Root cause:' . self::getErrorMessage(); $message .= ', Root cause:' . self::getErrorMessage();
} }
throw new \OC\DatabaseException($message, \OC::$server->getDatabaseConnection()->errorCode()); throw new \OC\DatabaseException($message);
} }
} }