Bug #5896 / Missing 'specific message' in database exception.

Database.php, DatabaseUpdate.php: implement 'specificMessage' in prepareExecute().

extension/qfq/qfq/database/Database.php

@@ -186,7 +186,7 @@ class Database {
             $specificMessage .= " ";
         }
 
-        $count = $this->prepareExecute($sql, $parameterArray, $queryType, $stat);
+        $count = $this->prepareExecute($sql, $parameterArray, $queryType, $stat, $specificMessage);
 
         if ($count === false) {
             throw new DbException($specificMessage . "No idea why this error happens - please take some time and check the problem.", ERROR_DB_GENERIC_CHECK);
@@ -287,7 +287,7 @@ class Database {
      * @throws \qfq\DbException
      * @throws \qfq\UserFormException
      */
-    private function prepareExecute($sql, array $parameterArray = array(), &$queryType, array &$stat) {
+    private function prepareExecute($sql, array $parameterArray = array(), &$queryType, array &$stat, $specificMessage = '') {
 
         $sqlLogMode = $this->isSqlModify($sql) ? SQL_LOG_MODE_MODIFY : SQL_LOG_MODE_ALL;
         $result = 0;
@@ -297,25 +297,27 @@ class Database {
             $this->store->setVar(SYSTEM_SQL_FINAL, $sql, STORE_SYSTEM);
             $this->store->setVar(SYSTEM_SQL_PARAM_ARRAY, $parameterArray, STORE_SYSTEM);
         }
-
+        if ($specificMessage !== '') {
+            $specificMessage = ' - ' . $specificMessage;
+        }
         // Logfile
         $this->dbLog($sqlLogMode, $sql, $parameterArray);
 
         if (false === ($this->mysqli_stmt = $this->mysqli->prepare($sql))) {
             $this->dbLog(SQL_LOG_MODE_ERROR, $sql, $parameterArray);
-            throw new DbException('[ mysqli: ' . $this->mysqli->errno . ' ] ' . $this->mysqli->error, ERROR_DB_PREPARE);
+            throw new DbException('[ mysqli: ' . $this->mysqli->errno . ' ] ' . $this->mysqli->error . $specificMessage, ERROR_DB_PREPARE);
         }
 
         if (count($parameterArray) > 0) {
             if (false === $this->prepareBindParam($parameterArray)) {
                 $this->dbLog(SQL_LOG_MODE_ERROR, $sql, $parameterArray);
-                throw new DbException('[ mysqli: ' . $this->mysqli_stmt->errno . ' ] ' . $this->mysqli_stmt->error, ERROR_DB_BIND);
+                throw new DbException('[ mysqli: ' . $this->mysqli_stmt->errno . ' ] ' . $this->mysqli_stmt->error . $specificMessage, ERROR_DB_BIND);
             }
         }
 
         if (false === $this->mysqli_stmt->execute()) {
             $this->dbLog(SQL_LOG_MODE_ERROR, $sql, $parameterArray);
-            throw new DbException('[ mysqli: ' . $this->mysqli_stmt->errno . ' ] ' . $this->mysqli_stmt->error, ERROR_DB_EXECUTE);
+            throw new DbException('[ mysqli: ' . $this->mysqli_stmt->errno . ' ] ' . $this->mysqli_stmt->error . $specificMessage, ERROR_DB_EXECUTE);
         }
 
         $msg = '';
@@ -327,7 +329,7 @@ class Database {
             case 'DESCRIBE':
             case 'EXPLAIN':
                 if (false === ($result = $this->mysqli_stmt->get_result())) {
-                    throw new DbException('[ mysqli: ' . $this->mysqli_stmt->errno . ' ] ' . $this->mysqli_stmt->error, ERROR_DB_EXECUTE);
+                    throw new DbException('[ mysqli: ' . $this->mysqli_stmt->errno . ' ] ' . $this->mysqli_stmt->error . $specificMessage, ERROR_DB_EXECUTE);
                 }
                 $queryType = QUERY_TYPE_SELECT;
                 $this->mysqli_result = $result;
@@ -363,7 +365,7 @@ class Database {
                 break;
 
             default:
-                throw new DbException('Unknown comand: "' . $command . '"', ERROR_DB_UNKNOWN_COMMAND);
+                throw new DbException('Unknown comand: "' . $command . '"' . $specificMessage, ERROR_DB_UNKNOWN_COMMAND);
                 break;
         }
 

extension/qfq/qfq/database/DatabaseUpdate.php

@@ -167,7 +167,7 @@ class DatabaseUpdate {
             if ($apply) {
                 // Play Statements
                 foreach ($sqlStatements as $sql) {
-                    $this->db->sql($sql);
+                    $this->db->sql($sql, ROW_REGULAR, array(), "Apply updates to QFQ database. Installed version: $old. New QFQ version: $new");
                 }
                 // Remember already applied updates - in case something breaks and the update has to be repeated.
                 $this->setDatabaseVersion($new);