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

Move building error string to connection

This commit is contained in:
Bart Visscher 2013-07-01 18:20:27 +02:00
parent de83bf98c7
commit 000b5a801f
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/db.php
View File

@ -433,16 +433,8 @@ class OC_DB {
*/ */
public static function getErrorMessage($error) { public static function getErrorMessage($error) {
if (self::$connection) { if (self::$connection) {
$msg = self::$connection->errorCode() . ': '; return self::$connection->getError();
$errorInfo = self::$connection->errorInfo();
if (is_array($errorInfo)) {
$msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
$msg .= 'Driver Code = '.$errorInfo[1] . ', ';
$msg .= 'Driver Message = '.$errorInfo[2];
}
return $msg;
} }
return ''; return '';
} }

17
lib/db/connection.php
View File

@ -148,6 +148,23 @@ class Connection extends \Doctrine\DBAL\Connection {
return $this->adapter->insertIfNotExist($table, $input); return $this->adapter->insertIfNotExist($table, $input);
} }
/**
* returns the error code and message as a string for logging
* works with DoctrineException
* @param mixed $error
* @return string
*/
public function getError() {
$msg = $this->errorCode() . ': ';
$errorInfo = $this->errorInfo();
if (is_array($errorInfo)) {
$msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
$msg .= 'Driver Code = '.$errorInfo[1] . ', ';
$msg .= 'Driver Message = '.$errorInfo[2];
}
return $msg;
}
// internal use // internal use
protected function replaceTablePrefix($statement) { protected function replaceTablePrefix($statement) {
return str_replace( '*PREFIX*', $this->table_prefix, $statement ); return str_replace( '*PREFIX*', $this->table_prefix, $statement );