Merge pull request #8804 from MrPetovan/bug/warnings

[friendica.git] / src / Database / Database.php

diff --git a/src/Database/Database.php b/src/Database/Database.php
index 4b39a13e68d3d578fb5e43705e70bd223bb1f18b..897845ce0c8d6ba700c1a794d4149c99f0e1263c 100644 (file)
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -319,7 +319,7 @@ class Database
                }
 
                $watchlist = explode(',', $this->configCache->get('system', 'db_log_index_watch'));
-               $blacklist = explode(',', $this->configCache->get('system', 'db_log_index_blacklist'));
+               $denylist = explode(',', $this->configCache->get('system', 'db_log_index_denylist'));
 
                while ($row = $this->fetch($r)) {
                        if ((intval($this->configCache->get('system', 'db_loglimit_index')) > 0)) {
@@ -333,7 +333,7 @@ class Database
                                $log = true;
                        }
 
-                       if (in_array($row['key'], $blacklist) || ($row['key'] == "")) {
+                       if (in_array($row['key'], $denylist) || ($row['key'] == "")) {
                                $log = false;
                        }
 
@@ -349,7 +349,7 @@ class Database
        }
 
        /**
-        * Removes every not whitelisted character from the identifier string
+        * Removes every not allowlisted character from the identifier string
         *
         * @param string $identifier
         *
@@ -505,6 +505,7 @@ class Database
                        $sql = "/*" . System::callstack() . " */ " . $sql;
                }
 
+               $is_error            = false;
                $this->error         = '';
                $this->errorno       = 0;
                $this->affected_rows = 0;
@@ -534,6 +535,7 @@ class Database
                                                $this->error   = $errorInfo[2];
                                                $this->errorno = $errorInfo[1];
                                                $retval        = false;
+                                               $is_error      = true;
                                                break;
                                        }
                                        $this->affected_rows = $retval->rowCount();
@@ -546,6 +548,7 @@ class Database
                                        $this->error   = $errorInfo[2];
                                        $this->errorno = $errorInfo[1];
                                        $retval        = false;
+                                       $is_error      = true;
                                        break;
                                }
 
@@ -563,6 +566,7 @@ class Database
                                        $this->error   = $errorInfo[2];
                                        $this->errorno = $errorInfo[1];
                                        $retval        = false;
+                                       $is_error      = true;
                                } else {
                                        $retval              = $stmt;
                                        $this->affected_rows = $retval->rowCount();
@@ -581,6 +585,7 @@ class Database
                                                $this->error   = $this->connection->error;
                                                $this->errorno = $this->connection->errno;
                                                $retval        = false;
+                                               $is_error      = true;
                                        } else {
                                                if (isset($retval->num_rows)) {
                                                        $this->affected_rows = $retval->num_rows;
@@ -597,6 +602,7 @@ class Database
                                        $this->error   = $stmt->error;
                                        $this->errorno = $stmt->errno;
                                        $retval        = false;
+                                       $is_error      = true;
                                        break;
                                }
 
@@ -624,6 +630,7 @@ class Database
                                        $this->error   = $this->connection->error;
                                        $this->errorno = $this->connection->errno;
                                        $retval        = false;
+                                       $is_error      = true;
                                } else {
                                        $stmt->store_result();
                                        $retval              = $stmt;
@@ -632,6 +639,16 @@ class Database
                                break;
                }
 
+               // See issue https://github.com/friendica/friendica/issues/8572
+               // Ensure that we always get an error message on an error.
+               if ($is_error && empty($this->errorno)) {
+                       $this->errorno = -1;
+               }
+
+               if ($is_error && empty($this->error)) {
+                       $this->error = 'Unknown database error';
+               }
+
                // We are having an own error logging in the function "e"
                if (($this->errorno != 0) && !$called_from_e) {
                        // We have to preserve the error code, somewhere in the logging it get lost
@@ -643,8 +660,8 @@ class Database
                        }
 
                        $this->logger->error('DB Error', [
-                               'code'      => $this->errorno,
-                               'error'     => $this->error,
+                               'code'      => $errorno,
+                               'error'     => $error,
                                'callstack' => System::callstack(8),
                                'params'    => $this->replaceParameters($sql, $args),
                        ]);
@@ -655,21 +672,21 @@ class Database
                                        // It doesn't make sense to continue when the database connection was lost
                                        if ($this->in_retrial) {
                                                $this->logger->notice('Giving up retrial because of database error', [
-                                                       'code'  => $this->errorno,
-                                                       'error' => $this->error,
+                                                       'code'  => $errorno,
+                                                       'error' => $error,
                                                ]);
                                        } else {
                                                $this->logger->notice('Couldn\'t reconnect after database error', [
-                                                       'code'  => $this->errorno,
-                                                       'error' => $this->error,
+                                                       'code'  => $errorno,
+                                                       'error' => $error,
                                                ]);
                                        }
                                        exit(1);
                                } else {
                                        // We try it again
                                        $this->logger->notice('Reconnected after database error', [
-                                               'code'  => $this->errorno,
-                                               'error' => $this->error,
+                                               'code'  => $errorno,
+                                               'error' => $error,
                                        ]);
                                        $this->in_retrial = true;
                                        $ret              = $this->p($sql, $args);
@@ -746,8 +763,8 @@ class Database
                        }
 
                        $this->logger->error('DB Error', [
-                               'code'      => $this->errorno,
-                               'error'     => $this->error,
+                               'code'      => $errorno,
+                               'error'     => $error,
                                'callstack' => System::callstack(8),
                                'params'    => $this->replaceParameters($sql, $params),
                        ]);
@@ -756,8 +773,8 @@ class Database
                        // A reconnect like in $this->p could be dangerous with modifications
                        if ($errorno == 2006) {
                                $this->logger->notice('Giving up because of database error', [
-                                       'code'  => $this->errorno,
-                                       'error' => $this->error,
+                                       'code'  => $errorno,
+                                       'error' => $error,
                                ]);
                                exit(1);
                        }
@@ -962,7 +979,7 @@ class Database
         * @return boolean was the insert successful?
         * @throws \Exception
         */
-       public function insert($table, $param, $on_duplicate_update = false)
+       public function insert($table, array $param, bool $on_duplicate_update = false)
        {
                if (empty($table) || empty($param)) {
                        $this->logger->info('Table and fields have to be set');