X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDatabase%2FDatabase.php;h=946c82f5c5776c48ebd63e5160f683564a712cc2;hb=d4a5a8051ad34a7be72238967afb3e6b140afdc8;hp=671425f9d188c8d19a42f0544b177db7aa9a98d6;hpb=b1afcb5ebfb270f7419339a636293890ce2da8ea;p=friendica.git

diff --git a/src/Database/Database.php b/src/Database/Database.php
index 671425f9d1..946c82f5c5 100644
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -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,11 +21,14 @@
 
 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;
 use Friendica\Network\HTTPException\ServiceUnavailableException;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Profiler;
+use InvalidArgumentException;
 use mysqli;
 use mysqli_result;
 use mysqli_stmt;
@@ -33,62 +36,89 @@ 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 $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       = [];
-
-	public function __construct(Cache $configCache, Profiler $profiler, LoggerInterface $logger)
+	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(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();
+	}
 
-		if ($this->isConnected()) {
-			// Loads DB_UPDATE_VERSION constant
-			DBStructure::definition($configCache->get('system', 'basepath'), false);
-		}
+	/**
+	 * @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;
 	}
 
-	public function connect()
+	/**
+	 * Tries to connect to database
+	 *
+	 * @return bool Success
+	 */
+	public function connect(): bool
 	{
 		if (!is_null($this->connection) && $this->connected()) {
 			return $this->connected;
@@ -98,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]);
@@ -153,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()) {
@@ -165,17 +197,12 @@ class Database
 				if ($charset) {
 					$this->connection->set_charset($charset);
 				}
-
-				if ($socket) {
-					$this->connection->set_socket($socket);
-				}
-
 			}
 		}
 
 		// No suitable SQL driver was found.
 		if (!$this->connected) {
-			$this->driver     = null;
+			$this->driver     = '';
 			$this->connection = null;
 		}
 
@@ -186,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
@@ -210,6 +223,7 @@ class Database
 	{
 		$this->profiler = $profiler;
 	}
+
 	/**
 	 * Disconnects the current database connection
 	 */
@@ -227,7 +241,7 @@ class Database
 			}
 		}
 
-		$this->driver    = null;
+		$this->driver    = '';
 		$this->connected = false;
 	}
 
@@ -255,7 +269,7 @@ class Database
 	 *
 	 * @return string with either "pdo" or "mysqli"
 	 */
-	public function getDriver()
+	public function getDriver(): string
 	{
 		return $this->driver;
 	}
@@ -266,9 +280,9 @@ class Database
 	 * This function discriminate between the deprecated mysql API and the current
 	 * object-oriented mysqli API. Example of returned string: 5.5.46-0+deb8u1
 	 *
-	 * @return string
+	 * @return string Database server information
 	 */
-	public function serverInfo()
+	public function serverInfo(): string
 	{
 		if ($this->server_info == '') {
 			switch ($this->driver) {
@@ -286,10 +300,10 @@ class Database
 	/**
 	 * Returns the selected database name
 	 *
-	 * @return string
+	 * @return string Database name
 	 * @throws \Exception
 	 */
-	public function databaseName()
+	public function databaseName(): string
 	{
 		$ret  = $this->p("SELECT DATABASE() AS `db`");
 		$data = $this->toArray($ret);
@@ -300,13 +314,13 @@ class Database
 	 * Analyze a database query and log this if some conditions are met.
 	 *
 	 * @param string $query The database query that will be analyzed
-	 *
+	 * @return void
 	 * @throws \Exception
 	 */
-	private function logIndex($query)
+	private function logIndex(string $query)
 	{
 
-		if (!$this->configCache->get('system', 'db_log_index')) {
+		if (!$this->config->get('system', 'db_log_index')) {
 			return;
 		}
 
@@ -325,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;
 			}
 
@@ -346,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
+				);
 			}
 		}
 	}
@@ -359,11 +377,10 @@ class Database
 	 * Removes every not allowlisted character from the identifier string
 	 *
 	 * @param string $identifier
-	 *
 	 * @return string sanitized identifier
 	 * @throws \Exception
 	 */
-	private function sanitizeIdentifier($identifier)
+	private function sanitizeIdentifier(string $identifier): string
 	{
 		return preg_replace('/[^A-Za-z0-9_\-]+/', '', $identifier);
 	}
@@ -383,11 +400,21 @@ class Database
 		}
 	}
 
-	public function isConnected()
+	/**
+	 * Returns connected flag
+	 *
+	 * @return bool Whether connection to database was success
+	 */
+	public function isConnected(): bool
 	{
 		return $this->connected;
 	}
 
+	/**
+	 * Checks connection status
+	 *
+	 * @return bool Whether connection to database was success
+	 */
 	public function connected()
 	{
 		$connected = false;
@@ -424,11 +451,11 @@ class Database
 	 *
 	 * @return string The input SQL string modified if necessary.
 	 */
-	public function anyValueFallback($sql)
+	public function anyValueFallback(string $sql): string
 	{
 		$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;
@@ -442,7 +469,7 @@ class Database
 	 *
 	 * @return string The replaced SQL query
 	 */
-	private function replaceParameters($sql, $args)
+	private function replaceParameters(string $sql, array $args): string
 	{
 		$offset = 0;
 		foreach ($args as $param => $value) {
@@ -476,9 +503,9 @@ class Database
 	 * @return bool|object statement object or result object
 	 * @throws \Exception
 	 */
-	public function p($sql)
+	public function p(string $sql)
 	{
-
+		$this->currentTable = null;
 		$this->profiler->startRecording('database');
 		$stamp1 = microtime(true);
 
@@ -501,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);
@@ -509,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;
 		}
 
@@ -540,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 = $errorInfo[1];
+						$this->error   = (string)$errorInfo[2];
+						$this->errorno = (int)$errorInfo[1];
 						$retval        = false;
 						$is_error      = true;
 						break;
@@ -553,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 = $errorInfo[1];
+					$this->error   = (string)$errorInfo[2];
+					$this->errorno = (int)$errorInfo[1];
 					$retval        = false;
 					$is_error      = true;
 					break;
@@ -573,8 +600,8 @@ class Database
 
 				if (!$stmt->execute()) {
 					$errorInfo     = $stmt->errorInfo();
-					$this->error   = $errorInfo[2];
-					$this->errorno = $errorInfo[1];
+					$this->error   = (string)$errorInfo[2];
+					$this->errorno = (int)$errorInfo[1];
 					$retval        = false;
 					$is_error      = true;
 				} else {
@@ -592,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 {
@@ -609,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;
@@ -626,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';
@@ -640,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 {
@@ -675,7 +702,6 @@ class Database
 			$this->logger->error('DB Error', [
 				'code'      => $errorno,
 				'error'     => $error,
-				'callstack' => System::callstack(8),
 				'params'    => $this->replaceParameters($sql, $args),
 			]);
 
@@ -708,24 +734,28 @@ class Database
 				}
 			}
 
-			$this->error   = $error;
-			$this->errorno = $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;
@@ -738,11 +768,12 @@ 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($sql)
+	public function e(string $sql): bool
 	{
+		$retval = false;
 
 		$this->profiler->startRecording('database_write');
 
@@ -778,7 +809,6 @@ class Database
 			$this->logger->error('DB Error', [
 				'code'      => $errorno,
 				'error'     => $error,
-				'callstack' => System::callstack(8),
 				'params'    => $this->replaceParameters($sql, $params),
 			]);
 
@@ -804,13 +834,14 @@ class Database
 	/**
 	 * Check if data exists
 	 *
-	 * @param string|array $table     Table name or array [schema => table]
-	 * @param array        $condition array of fields for condition
+	 * @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?
 	 * @throws \Exception
+	 * @todo Please unwrap the DBStructure::existsTable() call so this method has one behavior only: checking existence on records
 	 */
-	public function exists($table, $condition)
+	public function exists(string $table, array $condition): bool
 	{
 		if (empty($table)) {
 			return false;
@@ -850,10 +881,10 @@ class Database
 	 *
 	 * @param string $sql SQL statement
 	 *
-	 * @return array first row of query
+	 * @return array|bool first row of query or false on failure
 	 * @throws \Exception
 	 */
-	public function fetchFirst($sql)
+	public function fetchFirst(string $sql)
 	{
 		$params = DBA::getParam(func_get_args());
 
@@ -875,7 +906,7 @@ class Database
 	 *
 	 * @return int Number of rows
 	 */
-	public function affectedRows()
+	public function affectedRows(): int
 	{
 		return $this->affected_rows;
 	}
@@ -887,7 +918,7 @@ class Database
 	 *
 	 * @return int Number of columns
 	 */
-	public function columnCount($stmt)
+	public function columnCount($stmt): int
 	{
 		if (!is_object($stmt)) {
 			return 0;
@@ -908,7 +939,7 @@ class Database
 	 *
 	 * @return int Number of rows
 	 */
-	public function numRows($stmt)
+	public function numRows($stmt): int
 	{
 		if (!is_object($stmt)) {
 			return 0;
@@ -927,7 +958,7 @@ class Database
 	 *
 	 * @param bool|PDOStatement|mysqli_stmt $stmt statement object
 	 *
-	 * @return array|false current row
+	 * @return array|bool Current row or false on failure
 	 */
 	public function fetch($stmt)
 	{
@@ -942,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:
@@ -987,14 +1018,14 @@ class Database
 	/**
 	 * Insert a row into a table. Field value objects will be cast as string.
 	 *
-	 * @param string|array $table          Table name or array [schema => table]
-	 * @param array        $param          parameter array
-	 * @param int          $duplicate_mode What to do on a duplicated entry
+	 * @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
 	 *
 	 * @return boolean was the insert successful?
 	 * @throws \Exception
 	 */
-	public function insert($table, array $param, int $duplicate_mode = self::INSERT_DEFAULT)
+	public function insert(string $table, array $param, int $duplicate_mode = self::INSERT_DEFAULT): bool
 	{
 		if (empty($table) || empty($param)) {
 			$this->logger->info('Table and fields have to be set');
@@ -1003,7 +1034,7 @@ class Database
 
 		$param = $this->castFields($table, $param);
 
-		$table_string = DBA::buildTableString($table);
+		$table_string = DBA::buildTableString([$table]);
 
 		$fields_string = implode(', ', array_map([DBA::class, 'quoteIdentifier'], array_keys($param)));
 
@@ -1038,13 +1069,12 @@ 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|array $table Table name or array [schema => table]
-	 * @param array        $param parameter array
-	 *
+	 * @param string $table Table name in format [schema.]table
+	 * @param array  $param parameter array
 	 * @return boolean was the insert successful?
 	 * @throws \Exception
 	 */
-	public function replace($table, array $param)
+	public function replace(string $table, array $param): bool
 	{
 		if (empty($table) || empty($param)) {
 			$this->logger->info('Table and fields have to be set');
@@ -1053,7 +1083,7 @@ class Database
 
 		$param = $this->castFields($table, $param);
 
-		$table_string = DBA::buildTableString($table);
+		$table_string = DBA::buildTableString([$table]);
 
 		$fields_string = implode(', ', array_map([DBA::class, 'quoteIdentifier'], array_keys($param)));
 
@@ -1069,7 +1099,7 @@ class Database
 	 *
 	 * @return integer Last inserted id
 	 */
-	public function lastInsertId()
+	public function lastInsertId(): int
 	{
 		switch ($this->driver) {
 			case self::PDO:
@@ -1087,12 +1117,11 @@ class Database
 	 *
 	 * This function can be extended in the future to accept a table array as well.
 	 *
-	 * @param string|array $table Table name or array [schema => table]
-	 *
+	 * @param string $table Table name in format [schema.]table
 	 * @return boolean was the lock successful?
 	 * @throws \Exception
 	 */
-	public function lock($table)
+	public function lock(string $table): bool
 	{
 		// See here: https://dev.mysql.com/doc/refman/5.7/en/lock-tables-and-transactions.html
 		if ($this->driver == self::PDO) {
@@ -1102,7 +1131,7 @@ class Database
 			$this->connection->autocommit(false);
 		}
 
-		$success = $this->e("LOCK TABLES " . DBA::buildTableString($table) . " WRITE");
+		$success = $this->e("LOCK TABLES " . DBA::buildTableString([$table]) . " WRITE");
 
 		if ($this->driver == self::PDO) {
 			$this->connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, $this->pdo_emulate_prepares);
@@ -1126,7 +1155,7 @@ class Database
 	 * @return boolean was the unlock successful?
 	 * @throws \Exception
 	 */
-	public function unlock()
+	public function unlock(): bool
 	{
 		// See here: https://dev.mysql.com/doc/refman/5.7/en/lock-tables-and-transactions.html
 		$this->performCommit();
@@ -1177,7 +1206,12 @@ class Database
 		return true;
 	}
 
-	protected function performCommit()
+	/**
+	 * Performs the commit
+	 *
+	 * @return boolean Was the command executed successfully?
+	 */
+	protected function performCommit(): bool
 	{
 		switch ($this->driver) {
 			case self::PDO:
@@ -1199,7 +1233,7 @@ class Database
 	 *
 	 * @return boolean Was the command executed successfully?
 	 */
-	public function commit()
+	public function commit(): bool
 	{
 		if (!$this->performCommit()) {
 			return false;
@@ -1213,7 +1247,7 @@ class Database
 	 *
 	 * @return boolean Was the command executed successfully?
 	 */
-	public function rollback()
+	public function rollback(): bool
 	{
 		$ret = false;
 
@@ -1230,6 +1264,7 @@ class Database
 				$ret = $this->connection->rollback();
 				break;
 		}
+
 		$this->in_transaction = false;
 		return $ret;
 	}
@@ -1243,19 +1278,19 @@ class Database
 	 * @return boolean was the delete successful?
 	 * @throws \Exception
 	 */
-	public function delete($table, array $conditions)
+	public function delete(string $table, array $conditions): bool
 	{
 		if (empty($table) || empty($conditions)) {
 			$this->logger->info('Table and conditions have to be set');
 			return false;
 		}
 
-		$table_string = DBA::buildTableString($table);
+		$table_string = DBA::buildTableString([$table]);
 
 		$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);
 	}
 
@@ -1280,16 +1315,17 @@ 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|array  $table      Table name or array [schema => table]
+	 * @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
 	 */
-	public function update($table, $fields, $condition, $old_fields = [], $params = [])
+	public function update(string $table, array $fields, array $condition, $old_fields = [], array $params = [])
 	{
 		if (empty($table) || empty($fields) || empty($condition)) {
 			$this->logger->info('Table, fields and condition have to be set');
@@ -1321,8 +1357,17 @@ class Database
 		}
 
 		$fields = $this->castFields($table, $fields);
+		$direct_fields = [];
 
-		$table_string = DBA::buildTableString($table);
+		foreach ($fields as $key => $value) {
+			if (is_numeric($key)) {
+				$direct_fields[] = $value;
+				unset($fields[$key]);
+			}
+		}
+
+
+		$table_string = DBA::buildTableString([$table]);
 
 		$condition_string = DBA::buildCondition($condition);
 
@@ -1333,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);
 	}
@@ -1345,16 +1391,16 @@ class Database
 	/**
 	 * Retrieve a single record from a table and returns it in an associative array
 	 *
-	 * @param string|array $table
-	 * @param array        $fields
-	 * @param array        $condition
-	 * @param array        $params
+	 * @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
 	 *
 	 * @return bool|array
 	 * @throws \Exception
 	 * @see   $this->select
 	 */
-	public function selectFirst($table, array $fields = [], array $condition = [], $params = [])
+	public function selectFirst(string $table, array $fields = [], array $condition = [], array $params = [])
 	{
 		$params['limit'] = 1;
 		$result          = $this->select($table, $fields, $condition, $params);
@@ -1371,16 +1417,15 @@ class Database
 	/**
 	 * Select rows from a table and fills an array with the data
 	 *
-	 * @param string|array $table     Table name or array [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
-	 *
+	 * @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
 	 * @return array Data array
 	 * @throws \Exception
 	 * @see   self::select
 	 */
-	public function selectToArray($table, array $fields = [], array $condition = [], array $params = [])
+	public function selectToArray(string $table, array $fields = [], array $condition = [], array $params = [])
 	{
 		return $this->toArray($this->select($table, $fields, $condition, $params));
 	}
@@ -1388,11 +1433,11 @@ class Database
 	/**
 	 * Escape fields, adding special treatment for "group by" handling
 	 *
-	 * @param array $fields 
-	 * @param array $options 
-	 * @return array 
+	 * @param array $fields
+	 * @param array $options
+	 * @return array Escaped fields
 	 */
-	private function escapeFields(array $fields, array $options)
+	private function escapeFields(array $fields, array $options): array
 	{
 		// In the case of a "GROUP BY" we have to add all the ORDER fields to the fieldlist.
 		// This needs to done to apply the "ANY_VALUE(...)" treatment from below to them.
@@ -1411,10 +1456,9 @@ class Database
 			}
 		}
 
-		array_walk($fields, function(&$value, $key) use ($options)
-		{
+		array_walk($fields, function (&$value, $key) use ($options) {
 			$field = $value;
-			$value = '`' . str_replace('`', '``', $value) . '`';
+			$value = DBA::quoteIdentifier($field);
 
 			if (!empty($options['group_by']) && !in_array($field, $options['group_by'])) {
 				$value = 'ANY_VALUE(' . $value . ') AS ' . $value;
@@ -1446,27 +1490,27 @@ class Database
 	 *
 	 * $data = DBA::select($table, $fields, $condition, $params);
 	 *
-	 * @param string|array $table     Table name or array [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
+	 * @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
 	 * @return boolean|object
 	 * @throws \Exception
 	 */
-	public function select($table, array $fields = [], array $condition = [], array $params = [])
+	public function select(string $table, array $fields = [], array $condition = [], array $params = [])
 	{
 		if (empty($table)) {
 			return false;
 		}
 
 		if (count($fields) > 0) {
-			$fields = $this->escapeFields($fields, $params);
+			$fields        = $this->escapeFields($fields, $params);
 			$select_string = implode(', ', $fields);
 		} else {
 			$select_string = '*';
 		}
 
-		$table_string = DBA::buildTableString($table);
+		$table_string = DBA::buildTableString([$table]);
 
 		$condition_string = DBA::buildCondition($condition);
 
@@ -1476,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;
@@ -1486,11 +1530,11 @@ class Database
 	/**
 	 * Counts the rows from a table satisfying the provided condition
 	 *
-	 * @param string|array $table     Table name or array [schema => table]
-	 * @param array        $condition Array of fields for condition
-	 * @param array        $params    Array of several parameters
+	 * @param string $table     Table name in format [schema.]table
+	 * @param array  $condition Array of fields for condition
+	 * @param array  $params    Array of several parameters
 	 *
-	 * @return int
+	 * @return int Count of rows
 	 *
 	 * Example:
 	 * $table = "post";
@@ -1502,13 +1546,13 @@ class Database
 	 * $count = DBA::count($table, $condition);
 	 * @throws \Exception
 	 */
-	public function count($table, array $condition = [], array $params = [])
+	public function count(string $table, array $condition = [], array $params = []): int
 	{
 		if (empty($table)) {
-			return false;
+			throw new InvalidArgumentException('Parameter "table" cannot be empty.');
 		}
 
-		$table_string = DBA::buildTableString($table);
+		$table_string = DBA::buildTableString([$table]);
 
 		$condition_string = DBA::buildCondition($condition);
 
@@ -1541,7 +1585,7 @@ class Database
 	 *
 	 * @return array Data array
 	 */
-	public function toArray($stmt, $do_close = true, int $count = 0)
+	public function toArray($stmt, bool $do_close = true, int $count = 0): array
 	{
 		if (is_bool($stmt)) {
 			return [];
@@ -1569,7 +1613,8 @@ class Database
 	 * @param array  $fields
 	 * @return array casted fields
 	 */
-	public function castFields(string $table, array $fields) {
+	public function castFields(string $table, array $fields): array
+	{
 		// When there is no data, we don't need to do something
 		if (empty($fields)) {
 			return $fields;
@@ -1587,15 +1632,15 @@ class Database
 
 		$types = [];
 
-		$tables = DBStructure::definition('', false);
+		$tables = $this->dbaDefinition->getAll();
 		if (empty($tables[$table])) {
 			// When a matching table wasn't found we check if it is a view
-			$views = View::definition('', false);
+			$views = $this->viewDefinition->getAll();
 			if (empty($views[$table])) {
 				return $fields;
 			}
 
-			foreach(array_keys($fields) as $field) {
+			foreach (array_keys($fields) as $field) {
 				if (!empty($views[$table]['fields'][$field])) {
 					$viewdef = $views[$table]['fields'][$field];
 					if (!empty($tables[$viewdef[0]]['fields'][$viewdef[1]]['type'])) {
@@ -1632,7 +1677,7 @@ class Database
 	 *
 	 * @return string Error number (0 if no error)
 	 */
-	public function errorNo()
+	public function errorNo(): int
 	{
 		return $this->errorno;
 	}
@@ -1642,7 +1687,7 @@ class Database
 	 *
 	 * @return string Error message ('' if no error)
 	 */
-	public function errorMessage()
+	public function errorMessage(): string
 	{
 		return $this->error;
 	}
@@ -1654,7 +1699,7 @@ class Database
 	 *
 	 * @return boolean was the close successful?
 	 */
-	public function close($stmt)
+	public function close($stmt): bool
 	{
 
 		$this->profiler->startRecording('database');
@@ -1696,38 +1741,70 @@ class Database
 	 *      'amount' => Number of concurrent database processes
 	 * @throws \Exception
 	 */
-	public function processlist()
+	public function processlist(): array
 	{
-		$ret  = $this->p("SHOW PROCESSLIST");
+		$ret  = $this->p('SHOW PROCESSLIST');
 		$data = $this->toArray($ret);
 
 		$processes = 0;
 		$states    = [];
 		foreach ($data as $process) {
-			$state = trim($process["State"]);
+			$state = trim($process['State']);
 
 			// Filter out all non blocking processes
-			if (!in_array($state, ["", "init", "statistics", "updating"])) {
+			if (!in_array($state, ['', 'init', 'statistics', 'updating'])) {
 				++$states[$state];
 				++$processes;
 			}
 		}
 
-		$statelist = "";
+		$statelist = '';
 		foreach ($states as $state => $usage) {
-			if ($statelist != "") {
-				$statelist .= ", ";
+			if ($statelist != '') {
+				$statelist .= ', ';
 			}
-			$statelist .= $state . ": " . $usage;
+			$statelist .= $state . ': ' . $usage;
 		}
-		return (["list" => $statelist, "amount" => $processes]);
+		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
 	 *
 	 * @param string $name
-	 * @return string content
+	 * @return string|null content or null if inexistent
+	 * @throws \Exception
 	 */
 	public function getVariable(string $name)
 	{
@@ -1739,10 +1816,9 @@ class Database
 	 * Checks if $array is a filled array with at least one entry.
 	 *
 	 * @param mixed $array A filled array with at least one entry
-	 *
 	 * @return boolean Whether $array is a filled array or an object with rows
 	 */
-	public function isResult($array)
+	public function isResult($array): bool
 	{
 		// It could be a return value from an update statement
 		if (is_bool($array)) {
@@ -1762,10 +1838,9 @@ class Database
 	 * @param mixed   $value         Array value
 	 * @param string  $key           Array key
 	 * @param boolean $add_quotation add quotation marks for string values
-	 *
 	 * @return void
 	 */
-	private function escapeArrayCallback(&$value, $key, $add_quotation)
+	private function escapeArrayCallback(&$value, string $key, bool $add_quotation)
 	{
 		if (!$add_quotation) {
 			if (is_bool($value)) {
@@ -1790,10 +1865,9 @@ class Database
 	 *
 	 * @param mixed   $arr           Array with values to be escaped
 	 * @param boolean $add_quotation add quotation marks for string values
-	 *
 	 * @return void
 	 */
-	public function escapeArray(&$arr, $add_quotation = false)
+	public function escapeArray(&$arr, bool $add_quotation = false)
 	{
 		array_walk($arr, [$this, 'escapeArrayCallback'], $add_quotation);
 	}
@@ -1801,15 +1875,16 @@ class Database
 	/**
 	 * Replaces a string in the provided fields of the provided table
 	 *
-	 * @param string $table_name
-	 * @param array  $fields List of field names in the provided table
-	 * @param string $search
-	 * @param string $replace
+	 * @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_name, array $fields, string $search, string $replace)
+	public function replaceInTableFields(string $table, array $fields, string $search, string $replace)
 	{
-		$search = $this->escape($search);
+		$search  = $this->escape($search);
 		$replace = $this->escape($replace);
 
 		$upd = [];
@@ -1820,9 +1895,10 @@ class Database
 
 		$upds = implode(', ', $upd);
 
-		$r = $this->e(sprintf("UPDATE %s SET %s;", $table_name, $upds));
+		$r = $this->e(sprintf("UPDATE %s SET %s;", DBA::quoteIdentifier($table), $upds));
+
 		if (!$this->isResult($r)) {
-			throw new \RuntimeException("Failed updating `$table_name`: " . $this->errorMessage());
+			throw new \RuntimeException("Failed updating `$table`: " . $this->errorMessage());
 		}
 	}
 }