Added new field to the test data

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

diff --git a/src/Database/Database.php b/src/Database/Database.php
index faa83d89e0c8504288f356291f56a7570cd129a3..05ce3693b4973fe67ed517c9737040361f341c18 100644 (file)
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -135,8 +135,9 @@ class Database
                }
 
                $this->emulate_prepares = (bool)$this->configCache->get('database', 'emulate_prepares');
+               $this->pdo_emulate_prepares = (bool)$this->configCache->get('database', 'pdo_emulate_prepares');
 
-               if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
+               if (!$this->configCache->get('database', 'disable_pdo') && class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
                        $this->driver = 'pdo';
                        $connect      = "mysql:host=" . $server . ";dbname=" . $db;
 
@@ -150,7 +151,7 @@ class Database
 
                        try {
                                $this->connection = @new PDO($connect, $user, $pass);
-                               $this->connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
+                               $this->connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, $this->pdo_emulate_prepares);
                                $this->connected = true;
                        } catch (PDOException $e) {
                                $this->connected = false;
@@ -504,6 +505,7 @@ class Database
                        $sql = "/*" . System::callstack() . " */ " . $sql;
                }
 
+               $is_error            = false;
                $this->error         = '';
                $this->errorno       = 0;
                $this->affected_rows = 0;
@@ -533,6 +535,7 @@ class Database
                                                $this->error   = $errorInfo[2];
                                                $this->errorno = $errorInfo[1];
                                                $retval        = false;
+                                               $is_error      = true;
                                                break;
                                        }
                                        $this->affected_rows = $retval->rowCount();
@@ -545,6 +548,7 @@ class Database
                                        $this->error   = $errorInfo[2];
                                        $this->errorno = $errorInfo[1];
                                        $retval        = false;
+                                       $is_error      = true;
                                        break;
                                }
 
@@ -562,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();
@@ -580,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;
@@ -596,6 +602,7 @@ class Database
                                        $this->error   = $stmt->error;
                                        $this->errorno = $stmt->errno;
                                        $retval        = false;
+                                       $is_error      = true;
                                        break;
                                }
 
@@ -623,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;
@@ -631,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
@@ -642,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),
                        ]);
@@ -654,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);
@@ -740,9 +758,13 @@ class Database
                        $error   = $this->error;
                        $errorno = $this->errorno;
 
+                       if ($this->testmode) {
+                               throw new Exception(DI::l10n()->t('Database error %d "%s" at "%s"', $errorno, $error, $this->replaceParameters($sql, $params)));
+                       }
+
                        $this->logger->error('DB Error', [
-                               'code'      => $this->errorno,
-                               'error'     => $this->error,
+                               'code'      => $errorno,
+                               'error'     => $error,
                                'callstack' => System::callstack(8),
                                'params'    => $this->replaceParameters($sql, $params),
                        ]);
@@ -751,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);
                        }
@@ -1025,7 +1047,7 @@ class Database
                $success = $this->e("LOCK TABLES " . DBA::buildTableString($table) . " WRITE");
 
                if ($this->driver == 'pdo') {
-                       $this->connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
+                       $this->connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, $this->pdo_emulate_prepares);
                }
 
                if (!$success) {
@@ -1058,7 +1080,7 @@ class Database
                $success = $this->e("UNLOCK TABLES");
 
                if ($this->driver == 'pdo') {
-                       $this->connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
+                       $this->connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, $this->pdo_emulate_prepares);
                        $this->e("SET autocommit=1");
                } else {
                        $this->connection->autocommit(true);