From ce2abcdbcaffd5afccde4b31586bd3672e5b22a7 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 20 May 2023 12:22:19 -0400 Subject: [PATCH] Move current table property from PDOStatement to Database class - Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1533036354 --- src/Database/Database.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Database/Database.php b/src/Database/Database.php index f931169ceb..78a534ead8 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); @@ -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; -- 2.39.5