wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5857 from nextcloud/database-exception-cleanup

Browse source 
Remove unneeded parameter in DatabaseException
This commit is contained in:
Morris Jobke 2017-07-24 16:14:53 +02:00 committed by GitHub
commit 5dc480a38c
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;
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 {
$result =$connection->prepare($query, $limit, $offset);
} catch (\Doctrine\DBAL\DBALException $e) {
throw new \OC\DatabaseException($e->getMessage(), $query);
throw new \OC\DatabaseException($e->getMessage());
}
// differentiate between query and manipulation
$result = new OC_DB_StatementWrapper($result, $isManipulation);
@ -214,7 +214,7 @@ class OC_DB {
} else {
$message .= ', Root cause:' . self::getErrorMessage();
}
throw new \OC\DatabaseException($message, \OC::$server->getDatabaseConnection()->errorCode());
throw new \OC\DatabaseException($message);
}
}