always be verbose when logging db error

diff --git a/lib/db.php b/lib/db.php
index 84b05dfe6e50580eafe44993f730a6baddcb5a0f..aee44e52596f430cb86f962c4d0520d0405a9b26 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -382,7 +382,7 @@ class OC_DB {
 
                        // Die if we have an error (error means: bad query, not 0 results!)
                        if( self::isError($result)) {
-                               throw new DatabaseException($result->getMessage(), $query);
+                               throw new DatabaseException(self::getErrorMessage($result), $query);
                        }
                }else{
                        try{
@@ -1117,10 +1117,8 @@ class OC_DB {
         */
        public static function getErrorMessage($error) {
                if ( self::$backend==self::BACKEND_MDB2 and PEAR::isError($error) ) {
-                       $msg = $error->getCode() . ': ' . $error->getMessage();
-                       if (defined('DEBUG') && DEBUG) {
-                               $msg .= '(' . $error->getDebugInfo() . ')';
-                       }
+                       $msg = $error->getCode() . ': ' . $error->getMessage()
+                                . ' (' . $error->getDebugInfo() . ')';
                } elseif (self::$backend==self::BACKEND_PDO and self::$PDO) {
                        $msg = self::$PDO->errorCode() . ': ';
                        $errorInfo = self::$PDO->errorInfo();