X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDatabase%2FDatabase.php;h=9366f1b31416e74e11d9ca6944fc3b1d229c1969;hb=c4870a16d4ffbd37d6c4f379abfe2d18cacb88ff;hp=b1ea6c1e4ffe4fa2b6db24e31cd93d57dba639b3;hpb=c4c80ed3cce6d11a4350b62ee055da9160a2fdfd;p=friendica.git

diff --git a/src/Database/Database.php b/src/Database/Database.php
index b1ea6c1e4f..9366f1b314 100644
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -80,6 +80,8 @@ class Database
 	protected $dbaDefinition;
 	/** @var ViewDefinition */
 	protected $viewDefinition;
+	/** @var string|null */
+	private $currentTable;
 
 	public function __construct(IManageConfigValues $config, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition)
 	{
@@ -503,7 +505,7 @@ class Database
 	 */
 	public function p(string $sql)
 	{
-
+		$this->currentTable = null;
 		$this->profiler->startRecording('database');
 		$stamp1 = microtime(true);
 
@@ -750,8 +752,8 @@ class Database
 				@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" .
+					basename($backtrace[1]['file']) . "\t" .
+					$backtrace[1]['line'] . "\t" . $backtrace[2]['function'] . "\t" .
 					substr($this->replaceParameters($sql, $args), 0, 4000) . "\n",
 					FILE_APPEND
 				);
@@ -973,8 +975,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:
@@ -1357,6 +1359,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]);
 
@@ -1369,7 +1380,8 @@ 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
@@ -1510,8 +1522,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;
@@ -1758,6 +1770,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
 	 *