]> git.mxchange.org Git - friendica.git/blobdiff - src/Database/Database.php
bump version 2023.12
[friendica.git] / src / Database / Database.php
index cd2803c0fc5c88368766a76c991beba2a94c8acd..946c82f5c5776c48ebd63e5160f683564a712cc2 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,7 +21,7 @@
 
 namespace Friendica\Database;
 
-use Friendica\Core\Config\ValueObject\Cache;
+use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\System;
 use Friendica\Database\Definition\DbaDefinition;
 use Friendica\Database\Definition\ViewDefinition;
@@ -36,62 +36,83 @@ use PDO;
 use PDOException;
 use PDOStatement;
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 
 /**
  * This class is for the low level database stuff that does driver specific things.
  */
 class Database
 {
-       const PDO = 'pdo';
+       const PDO    = 'pdo';
        const MYSQLI = 'mysqli';
 
        const INSERT_DEFAULT = 0;
-       const INSERT_UPDATE = 1;
-       const INSERT_IGNORE = 2;
+       const INSERT_UPDATE  = 1;
+       const INSERT_IGNORE  = 2;
 
        protected $connected = false;
 
        /**
-        * @var \Friendica\Core\Config\ValueObject\Cache
+        * @var IManageConfigValues
         */
-       protected $configCache;
+       protected $config = null;
        /**
         * @var Profiler
         */
-       protected $profiler;
+       protected $profiler = null;
        /**
         * @var LoggerInterface
         */
-       protected $logger;
-       protected $server_info    = '';
+       protected $logger = null;
+       protected $server_info = '';
        /** @var PDO|mysqli */
        protected $connection;
        protected $driver = '';
        protected $pdo_emulate_prepares = false;
-       private $error          = false;
-       private $errorno        = 0;
-       private $affected_rows  = 0;
+       private $error = '';
+       private $errorno = 0;
+       private $affected_rows = 0;
        protected $in_transaction = false;
-       protected $in_retrial     = false;
-       protected $testmode       = false;
-       private $relation       = [];
+       protected $in_retrial = false;
+       protected $testmode = false;
+       private $relation = [];
        /** @var DbaDefinition */
        protected $dbaDefinition;
        /** @var ViewDefinition */
        protected $viewDefinition;
+       /** @var string|null */
+       private $currentTable;
 
-       public function __construct(Cache $configCache, Profiler $profiler, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition, LoggerInterface $logger)
+       public function __construct(IManageConfigValues $config, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition)
        {
                // We are storing these values for being able to perform a reconnect
-               $this->configCache    = $configCache;
-               $this->profiler       = $profiler;
-               $this->logger         = $logger;
+               $this->config         = $config;
                $this->dbaDefinition  = $dbaDefinition;
                $this->viewDefinition = $viewDefinition;
 
+               // Use dummy values - necessary for the first factory call of the logger itself
+               $this->logger = new NullLogger();
+               $this->profiler = new Profiler($config);
+
                $this->connect();
        }
 
+       /**
+        * @param IManageConfigValues $config
+        * @param Profiler            $profiler
+        * @param LoggerInterface     $logger
+        *
+        * @return void
+        *
+        * @todo Make this method obsolete - use a clean pattern instead ...
+        */
+       public function setDependency(IManageConfigValues $config, Profiler $profiler, LoggerInterface $logger)
+       {
+               $this->logger   = $logger;
+               $this->profiler = $profiler;
+               $this->config   = $config;
+       }
+
        /**
         * Tries to connect to database
         *
@@ -107,47 +128,47 @@ class Database
                $this->connected = false;
 
                $port       = 0;
-               $serveraddr = trim($this->configCache->get('database', 'hostname'));
+               $serveraddr = trim($this->config->get('database', 'hostname') ?? '');
                $serverdata = explode(':', $serveraddr);
-               $server     = $serverdata[0];
+               $host       = trim($serverdata[0]);
                if (count($serverdata) > 1) {
                        $port = trim($serverdata[1]);
                }
 
-               if (!empty(trim($this->configCache->get('database', 'port')))) {
-                       $port = trim($this->configCache->get('database', 'port'));
+               if (trim($this->config->get('database', 'port') ?? 0)) {
+                       $port = trim($this->config->get('database', 'port') ?? 0);
                }
 
-               $server  = trim($server);
-               $user    = trim($this->configCache->get('database', 'username'));
-               $pass    = trim($this->configCache->get('database', 'password'));
-               $db      = trim($this->configCache->get('database', 'database'));
-               $charset = trim($this->configCache->get('database', 'charset'));
-               $socket  = trim($this->configCache->get('database', 'socket')); 
+               $user     = trim($this->config->get('database', 'username'));
+               $pass     = trim($this->config->get('database', 'password'));
+               $database = trim($this->config->get('database', 'database'));
+               $charset  = trim($this->config->get('database', 'charset'));
+               $socket   = trim($this->config->get('database', 'socket'));
 
-               if (!(strlen($server) && strlen($user))) {
+               if (!$host && !$socket || !$user) {
                        return false;
                }
 
-               $persistent = (bool)$this->configCache->get('database', 'persistent');
+               $persistent = (bool)$this->config->get('database', 'persistent');
 
-               $this->pdo_emulate_prepares = (bool)$this->configCache->get('database', 'pdo_emulate_prepares');
+               $this->pdo_emulate_prepares = (bool)$this->config->get('database', 'pdo_emulate_prepares');
 
-               if (!$this->configCache->get('database', 'disable_pdo') && class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
+               if (!$this->config->get('database', 'disable_pdo') && class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
                        $this->driver = self::PDO;
-                       $connect      = "mysql:host=" . $server . ";dbname=" . $db;
-
-                       if ($port > 0) {
-                               $connect .= ";port=" . $port;
+                       if ($socket) {
+                               $connect = 'mysql:unix_socket=' . $socket;
+                       } else {
+                               $connect = 'mysql:host=' . $host;
+                               if ($port > 0) {
+                                       $connect .= ';port=' . $port;
+                               }
                        }
 
                        if ($charset) {
-                               $connect .= ";charset=" . $charset;
+                               $connect .= ';charset=' . $charset;
                        }
 
-                       if ($socket) {
-                               $connect .= ";$unix_socket=" . $socket;
-                       }
+                       $connect .= ';dbname=' . $database;
 
                        try {
                                $this->connection = @new PDO($connect, $user, $pass, [PDO::ATTR_PERSISTENT => $persistent]);
@@ -162,10 +183,12 @@ class Database
                if (!$this->connected && class_exists('\mysqli')) {
                        $this->driver = self::MYSQLI;
 
-                       if ($port > 0) {
-                               $this->connection = @new mysqli($server, $user, $pass, $db, $port);
+                       if ($socket) {
+                               $this->connection = @new mysqli(null, $user, $pass, $database, null, $socket);
+                       } elseif ($port > 0) {
+                               $this->connection = @new mysqli($host, $user, $pass, $database, $port);
                        } else {
-                               $this->connection = @new mysqli($server, $user, $pass, $db);
+                               $this->connection = @new mysqli($host, $user, $pass, $database);
                        }
 
                        if (!mysqli_connect_errno()) {
@@ -174,11 +197,6 @@ class Database
                                if ($charset) {
                                        $this->connection->set_charset($charset);
                                }
-
-                               if ($socket) {
-                                       $this->connection->set_socket($socket);
-                               }
-
                        }
                }
 
@@ -195,20 +213,6 @@ class Database
        {
                $this->testmode = $test;
        }
-       /**
-        * Sets the logger for DBA
-        *
-        * @note this is necessary because if we want to load the logger configuration
-        *       from the DB, but there's an error, we would print out an exception.
-        *       So the logger gets updated after the logger configuration can be retrieved
-        *       from the database
-        *
-        * @param LoggerInterface $logger
-        */
-       public function setLogger(LoggerInterface $logger)
-       {
-               $this->logger = $logger;
-       }
 
        /**
         * Sets the profiler for DBA
@@ -219,6 +223,7 @@ class Database
        {
                $this->profiler = $profiler;
        }
+
        /**
         * Disconnects the current database connection
         */
@@ -315,7 +320,7 @@ class Database
        private function logIndex(string $query)
        {
 
-               if (!$this->configCache->get('system', 'db_log_index')) {
+               if (!$this->config->get('system', 'db_log_index')) {
                        return;
                }
 
@@ -334,18 +339,18 @@ class Database
                        return;
                }
 
-               $watchlist = explode(',', $this->configCache->get('system', 'db_log_index_watch'));
-               $denylist = explode(',', $this->configCache->get('system', 'db_log_index_denylist'));
+               $watchlist = explode(',', $this->config->get('system', 'db_log_index_watch'));
+               $denylist  = explode(',', $this->config->get('system', 'db_log_index_denylist'));
 
                while ($row = $this->fetch($r)) {
-                       if ((intval($this->configCache->get('system', 'db_loglimit_index')) > 0)) {
+                       if ((intval($this->config->get('system', 'db_loglimit_index')) > 0)) {
                                $log = (in_array($row['key'], $watchlist) &&
-                                       ($row['rows'] >= intval($this->configCache->get('system', 'db_loglimit_index'))));
+                                       ($row['rows'] >= intval($this->config->get('system', 'db_loglimit_index'))));
                        } else {
                                $log = false;
                        }
 
-                       if ((intval($this->configCache->get('system', 'db_loglimit_index_high')) > 0) && ($row['rows'] >= intval($this->configCache->get('system', 'db_loglimit_index_high')))) {
+                       if ((intval($this->config->get('system', 'db_loglimit_index_high')) > 0) && ($row['rows'] >= intval($this->config->get('system', 'db_loglimit_index_high')))) {
                                $log = true;
                        }
 
@@ -355,11 +360,15 @@ class Database
 
                        if ($log) {
                                $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-                               @file_put_contents($this->configCache->get('system', 'db_log_index'), DateTimeFormat::utcNow() . "\t" .
-                                                                                                     $row['key'] . "\t" . $row['rows'] . "\t" . $row['Extra'] . "\t" .
-                                                                                                     basename($backtrace[1]["file"]) . "\t" .
-                                                                                                     $backtrace[1]["line"] . "\t" . $backtrace[2]["function"] . "\t" .
-                                                                                                     substr($query, 0, 4000) . "\n", FILE_APPEND);
+                               @file_put_contents(
+                                       $this->config->get('system', 'db_log_index'),
+                                       DateTimeFormat::utcNow() . "\t" .
+                                       $row['key'] . "\t" . $row['rows'] . "\t" . $row['Extra'] . "\t" .
+                                       basename($backtrace[1]["file"]) . "\t" .
+                                       $backtrace[1]["line"] . "\t" . $backtrace[2]["function"] . "\t" .
+                                       substr($query, 0, 4000) . "\n",
+                                       FILE_APPEND
+                               );
                        }
                }
        }
@@ -446,7 +455,7 @@ class Database
        {
                $server_info = $this->serverInfo();
                if (version_compare($server_info, '5.7.5', '<') ||
-                   (stripos($server_info, 'MariaDB') !== false)) {
+                       (stripos($server_info, 'MariaDB') !== false)) {
                        $sql = str_ireplace('ANY_VALUE(', 'MIN(', $sql);
                }
                return $sql;
@@ -496,7 +505,7 @@ class Database
         */
        public function p(string $sql)
        {
-
+               $this->currentTable = null;
                $this->profiler->startRecording('database');
                $stamp1 = microtime(true);
 
@@ -519,7 +528,7 @@ class Database
 
                if ((substr_count($sql, '?') != count($args)) && (count($args) > 0)) {
                        // Question: Should we continue or stop the query here?
-                       $this->logger->warning('Query parameters mismatch.', ['query' => $sql, 'args' => $args, 'callstack' => System::callstack()]);
+                       $this->logger->warning('Query parameters mismatch.', ['query' => $sql, 'args' => $args]);
                }
 
                $sql = DBA::cleanQuery($sql);
@@ -527,7 +536,7 @@ class Database
 
                $orig_sql = $sql;
 
-               if ($this->configCache->get('system', 'db_callstack') !== null) {
+               if ($this->config->get('system', 'db_callstack') !== null) {
                        $sql = "/*" . System::callstack() . " */ " . $sql;
                }
 
@@ -558,8 +567,8 @@ class Database
                                if (count($args) == 0) {
                                        if (!$retval = $this->connection->query($this->replaceParameters($sql, $args))) {
                                                $errorInfo     = $this->connection->errorInfo();
-                                               $this->error   = $errorInfo[2];
-                                               $this->errorno = (int) $errorInfo[1];
+                                               $this->error   = (string)$errorInfo[2];
+                                               $this->errorno = (int)$errorInfo[1];
                                                $retval        = false;
                                                $is_error      = true;
                                                break;
@@ -571,8 +580,8 @@ class Database
                                /** @var $stmt mysqli_stmt|PDOStatement */
                                if (!$stmt = $this->connection->prepare($sql)) {
                                        $errorInfo     = $this->connection->errorInfo();
-                                       $this->error   = $errorInfo[2];
-                                       $this->errorno = (int) $errorInfo[1];
+                                       $this->error   = (string)$errorInfo[2];
+                                       $this->errorno = (int)$errorInfo[1];
                                        $retval        = false;
                                        $is_error      = true;
                                        break;
@@ -591,8 +600,8 @@ class Database
 
                                if (!$stmt->execute()) {
                                        $errorInfo     = $stmt->errorInfo();
-                                       $this->error   = $errorInfo[2];
-                                       $this->errorno = (int) $errorInfo[1];
+                                       $this->error   = (string)$errorInfo[2];
+                                       $this->errorno = (int)$errorInfo[1];
                                        $retval        = false;
                                        $is_error      = true;
                                } else {
@@ -610,8 +619,8 @@ class Database
                                if (!$can_be_prepared || (count($args) == 0)) {
                                        $retval = $this->connection->query($this->replaceParameters($sql, $args));
                                        if ($this->connection->errno) {
-                                               $this->error   = $this->connection->error;
-                                               $this->errorno = $this->connection->errno;
+                                               $this->error   = (string)$this->connection->error;
+                                               $this->errorno = (int)$this->connection->errno;
                                                $retval        = false;
                                                $is_error      = true;
                                        } else {
@@ -627,8 +636,8 @@ class Database
                                $stmt = $this->connection->stmt_init();
 
                                if (!$stmt->prepare($sql)) {
-                                       $this->error   = $stmt->error;
-                                       $this->errorno = $stmt->errno;
+                                       $this->error   = (string)$stmt->error;
+                                       $this->errorno = (int)$stmt->errno;
                                        $retval        = false;
                                        $is_error      = true;
                                        break;
@@ -644,7 +653,7 @@ class Database
                                        } elseif (is_string($args[$param])) {
                                                $param_types .= 's';
                                        } elseif (is_object($args[$param]) && method_exists($args[$param], '__toString')) {
-                                               $param_types .= 's';
+                                               $param_types  .= 's';
                                                $args[$param] = (string)$args[$param];
                                        } else {
                                                $param_types .= 'b';
@@ -658,8 +667,8 @@ class Database
                                }
 
                                if (!$stmt->execute()) {
-                                       $this->error   = $this->connection->error;
-                                       $this->errorno = $this->connection->errno;
+                                       $this->error   = (string)$this->connection->error;
+                                       $this->errorno = (int)$this->connection->errno;
                                        $retval        = false;
                                        $is_error      = true;
                                } else {
@@ -693,7 +702,6 @@ class Database
                        $this->logger->error('DB Error', [
                                'code'      => $errorno,
                                'error'     => $error,
-                               'callstack' => System::callstack(8),
                                'params'    => $this->replaceParameters($sql, $args),
                        ]);
 
@@ -726,24 +734,28 @@ class Database
                                }
                        }
 
-                       $this->error   = $error;
-                       $this->errorno = (int) $errorno;
+                       $this->error   = (string)$error;
+                       $this->errorno = (int)$errorno;
                }
 
                $this->profiler->stopRecording();
 
-               if ($this->configCache->get('system', 'db_log')) {
+               if ($this->config->get('system', 'db_log')) {
                        $stamp2   = microtime(true);
                        $duration = (float)($stamp2 - $stamp1);
 
-                       if (($duration > $this->configCache->get('system', 'db_loglimit'))) {
+                       if (($duration > $this->config->get('system', 'db_loglimit'))) {
                                $duration  = round($duration, 3);
                                $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
 
-                               @file_put_contents($this->configCache->get('system', 'db_log'), DateTimeFormat::utcNow() . "\t" . $duration . "\t" .
-                                                                                               basename($backtrace[1]["file"]) . "\t" .
-                                                                                               $backtrace[1]["line"] . "\t" . $backtrace[2]["function"] . "\t" .
-                                                                                               substr($this->replaceParameters($sql, $args), 0, 4000) . "\n", FILE_APPEND);
+                               @file_put_contents(
+                                       $this->config->get('system', 'db_log'),
+                                       DateTimeFormat::utcNow() . "\t" . $duration . "\t" .
+                                       basename($backtrace[1]['file']) . "\t" .
+                                       $backtrace[1]['line'] . "\t" . $backtrace[2]['function'] . "\t" .
+                                       substr($this->replaceParameters($sql, $args), 0, 4000) . "\n",
+                                       FILE_APPEND
+                               );
                        }
                }
                return $retval;
@@ -756,7 +768,7 @@ class Database
         *
         * @param string $sql SQL statement
         *
-        * @return boolean Was the query successfull? False is returned only if an error occurred
+        * @return boolean Was the query successful? False is returned only if an error occurred
         * @throws \Exception
         */
        public function e(string $sql): bool
@@ -797,7 +809,6 @@ class Database
                        $this->logger->error('DB Error', [
                                'code'      => $errorno,
                                'error'     => $error,
-                               'callstack' => System::callstack(8),
                                'params'    => $this->replaceParameters($sql, $params),
                        ]);
 
@@ -823,7 +834,7 @@ class Database
        /**
         * Check if data exists
         *
-        * @param string $table     Table name in format schema.table (while scheme is optiona)
+        * @param string $table     Table name in format [schema.]table
         * @param array  $condition Array of fields for condition
         *
         * @return boolean Are there rows for that condition?
@@ -962,8 +973,8 @@ class Database
                switch ($this->driver) {
                        case self::PDO:
                                $columns = $stmt->fetch(PDO::FETCH_ASSOC);
-                               if (!empty($stmt->table) && is_array($columns)) {
-                                       $columns = $this->castFields($stmt->table, $columns);
+                               if (!empty($this->currentTable) && is_array($columns)) {
+                                       $columns = $this->castFields($this->currentTable, $columns);
                                }
                                break;
                        case self::MYSQLI:
@@ -1007,7 +1018,7 @@ class Database
        /**
         * Insert a row into a table. Field value objects will be cast as string.
         *
-        * @param string $table          Table name in format schema.table (while scheme is optiona)
+        * @param string $table          Table name in format [schema.]table
         * @param array  $param          parameter array
         * @param int    $duplicate_mode What to do on a duplicated entry
         *
@@ -1058,7 +1069,7 @@ class Database
         * Inserts a row with the provided data in the provided table.
         * If the data corresponds to an existing row through a UNIQUE or PRIMARY index constraints, it updates the row instead.
         *
-        * @param string $table Table name in format schema.table (while scheme is optiona)
+        * @param string $table Table name in format [schema.]table
         * @param array  $param parameter array
         * @return boolean was the insert successful?
         * @throws \Exception
@@ -1106,7 +1117,7 @@ class Database
         *
         * This function can be extended in the future to accept a table array as well.
         *
-        * @param string $table Table name in format schema.table (while scheme is optiona)
+        * @param string $table Table name in format [schema.]table
         * @return boolean was the lock successful?
         * @throws \Exception
         */
@@ -1279,7 +1290,7 @@ class Database
                $condition_string = DBA::buildCondition($conditions);
 
                $sql = "DELETE FROM " . $table_string . " " . $condition_string;
-               $this->logger->debug($this->replaceParameters($sql, $conditions), ['callstack' => System::callstack(6)]);
+               $this->logger->debug($this->replaceParameters($sql, $conditions));
                return $this->e($sql, $conditions);
        }
 
@@ -1304,13 +1315,13 @@ class Database
         * Only set $old_fields to a boolean value when you are sure that you will update a single row.
         * When you set $old_fields to "true" then $fields must contain all relevant fields!
         *
-        * @param string        $table      Table name in format schema.table (while scheme is optiona)
+        * @param string        $table      Table name in format [schema.]table
         * @param array         $fields     contains the fields that are updated
         * @param array         $condition  condition array with the key values
         * @param array|boolean $old_fields array with the old field values that are about to be replaced (true = update on duplicate, false = don't update identical fields)
         * @param array         $params     Parameters: "ignore" If set to "true" then the update is done with the ignore parameter
         *
-        * @return boolean was the update successfull?
+        * @return boolean was the update successful?
         * @throws \Exception
         * @todo Implement "bool $update_on_duplicate" to avoid mixed type for $old_fields
         */
@@ -1346,6 +1357,15 @@ class Database
                }
 
                $fields = $this->castFields($table, $fields);
+               $direct_fields = [];
+
+               foreach ($fields as $key => $value) {
+                       if (is_numeric($key)) {
+                               $direct_fields[] = $value;
+                               unset($fields[$key]);
+                       }
+               }
+
 
                $table_string = DBA::buildTableString([$table]);
 
@@ -1358,11 +1378,12 @@ class Database
                }
 
                $sql = "UPDATE " . $ignore . $table_string . " SET "
-                       . implode(" = ?, ", array_map([DBA::class, 'quoteIdentifier'], array_keys($fields))) . " = ?"
+                       . ((count($fields) > 0) ? implode(" = ?, ", array_map([DBA::class, 'quoteIdentifier'], array_keys($fields))) . " = ?" : "")
+                       . ((count($direct_fields) > 0) ? ((count($fields) > 0) ? " , " : "") . implode(" , ", $direct_fields) : "")
                        . $condition_string;
 
                // Combines the updated fields parameter values with the condition parameter values
-               $params  = array_merge(array_values($fields), $condition);
+               $params = array_merge(array_values($fields), $condition);
 
                return $this->e($sql, $params);
        }
@@ -1370,7 +1391,7 @@ class Database
        /**
         * Retrieve a single record from a table and returns it in an associative array
         *
-        * @param string $table     Table name in format schema.table (while scheme is optiona)
+        * @param string $table     Table name in format [schema.]table
         * @param array  $fields    Array of selected fields, empty for all
         * @param array  $condition Array of fields for condition
         * @param array  $params    Array of several parameters
@@ -1396,7 +1417,7 @@ class Database
        /**
         * Select rows from a table and fills an array with the data
         *
-        * @param string $table     Table name in format schema.table (while scheme is optiona)
+        * @param string $table     Table name in format [schema.]table
         * @param array  $fields    Array of selected fields, empty for all
         * @param array  $condition Array of fields for condition
         * @param array  $params    Array of several parameters
@@ -1412,8 +1433,8 @@ class Database
        /**
         * Escape fields, adding special treatment for "group by" handling
         *
-        * @param array $fields 
-        * @param array $options 
+        * @param array $fields
+        * @param array $options
         * @return array Escaped fields
         */
        private function escapeFields(array $fields, array $options): array
@@ -1435,8 +1456,7 @@ class Database
                        }
                }
 
-               array_walk($fields, function(&$value, $key) use ($options)
-               {
+               array_walk($fields, function (&$value, $key) use ($options) {
                        $field = $value;
                        $value = DBA::quoteIdentifier($field);
 
@@ -1470,7 +1490,7 @@ class Database
         *
         * $data = DBA::select($table, $fields, $condition, $params);
         *
-        * @param string $table     Table name in format schema.table (while scheme is optiona)
+        * @param string $table     Table name in format [schema.]table
         * @param array  $fields    Array of selected fields, empty for all
         * @param array  $condition Array of fields for condition
         * @param array  $params    Array of several parameters
@@ -1484,7 +1504,7 @@ class Database
                }
 
                if (count($fields) > 0) {
-                       $fields = $this->escapeFields($fields, $params);
+                       $fields        = $this->escapeFields($fields, $params);
                        $select_string = implode(', ', $fields);
                } else {
                        $select_string = '*';
@@ -1500,8 +1520,8 @@ class Database
 
                $result = $this->p($sql, $condition);
 
-               if (($this->driver == self::PDO) && !empty($result) && is_string($table)) {
-                       $result->table = $table;
+               if ($this->driver == self::PDO && !empty($result)) {
+                       $this->currentTable = $table;
                }
 
                return $result;
@@ -1510,7 +1530,7 @@ class Database
        /**
         * Counts the rows from a table satisfying the provided condition
         *
-        * @param string $table     Table name in format schema.table (while scheme is optiona)
+        * @param string $table     Table name in format [schema.]table
         * @param array  $condition Array of fields for condition
         * @param array  $params    Array of several parameters
         *
@@ -1748,6 +1768,37 @@ class Database
                return (['list' => $statelist, 'amount' => $processes]);
        }
 
+       /**
+        * Optimizes tables
+        *
+        * @param string $table a given table
+        *
+        * @return bool True, if successfully optimized, otherwise false
+        * @throws \Exception
+        */
+       public function optimizeTable(string $table): bool
+       {
+               return $this->e("OPTIMIZE TABLE " . DBA::buildTableString([$table])) !== false;
+       }
+
+       /**
+        * Kill sleeping database processes
+        *
+        * @return void
+        */
+       public function deleteSleepingProcesses()
+       {
+               $processes = $this->p("SHOW FULL PROCESSLIST");
+               while ($process = $this->fetch($processes)) {
+                       if (($process['Command'] != 'Sleep') || ($process['Time'] < 300) || ($process['db'] != $this->databaseName())) {
+                               continue;
+                       }
+
+                       $this->e("KILL ?", $process['Id']);
+               }
+               $this->close($processes);
+       }
+
        /**
         * Fetch a database variable
         *
@@ -1824,16 +1875,16 @@ class Database
        /**
         * Replaces a string in the provided fields of the provided table
         *
-        * @param string $table  Table name
-        * @param array  $fields List of field names in the provided table
-        * @param string $search String to search for
+        * @param string $table   Table name
+        * @param array  $fields  List of field names in the provided table
+        * @param string $search  String to search for
         * @param string $replace String to replace with
         * @return void
         * @throws \Exception
         */
        public function replaceInTableFields(string $table, array $fields, string $search, string $replace)
        {
-               $search = $this->escape($search);
+               $search  = $this->escape($search);
                $replace = $this->escape($replace);
 
                $upd = [];