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

diff --git a/src/Database/Database.php b/src/Database/Database.php
index f931169ceb..946c82f5c5 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);
 
@@ -526,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);
@@ -700,7 +702,6 @@ class Database
 			$this->logger->error('DB Error', [
 				'code'      => $errorno,
 				'error'     => $error,
-				'callstack' => System::callstack(8),
 				'params'    => $this->replaceParameters($sql, $args),
 			]);
 
@@ -750,8 +751,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
 				);
@@ -808,7 +809,6 @@ class Database
 			$this->logger->error('DB Error', [
 				'code'      => $errorno,
 				'error'     => $error,
-				'callstack' => System::callstack(8),
 				'params'    => $this->replaceParameters($sql, $params),
 			]);
 
@@ -973,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:
@@ -1290,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);
 	}
 
@@ -1520,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;