Merge branch '2023.09-rc' into move-mentionbutton-to-navbar

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

diff --git a/src/Database/Database.php b/src/Database/Database.php
index f931169ceb4ae417bcee2932c4dfe73145e7c24b..9366f1b31416e74e11d9ca6944fc3b1d229c1969 100644 (file)
--- 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:
@@ -1520,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;