friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-24 04:04:59 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #13146 from MrPetovan/bug/deprecated

Browse source 
Move current table property from PDOStatement to Database class
This commit is contained in:
Michael Vogel 2023-05-20 18:53:38 +02:00 committed by GitHub
parent 61588be83f ce2abcdbca
commit 1d211bea98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Database/Database.php
View file

@ -80,6 +80,8 @@ class Database
protected $dbaDefinition; protected $dbaDefinition;
/** @var ViewDefinition */ /** @var ViewDefinition */
protected $viewDefinition; protected $viewDefinition;
/** @var string|null */
private $currentTable;
public function __construct(IManageConfigValues $config, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition) public function __construct(IManageConfigValues $config, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition)
{ {
@ -503,7 +505,7 @@ class Database
*/ */
public function p(string $sql) public function p(string $sql)
{ {
$this->currentTable = null;
$this->profiler->startRecording('database'); $this->profiler->startRecording('database');
$stamp1 = microtime(true); $stamp1 = microtime(true);
@ -973,8 +975,8 @@ class Database
switch ($this->driver) { switch ($this->driver) {
case self::PDO: case self::PDO:
$columns = $stmt->fetch(PDO::FETCH_ASSOC); $columns = $stmt->fetch(PDO::FETCH_ASSOC);
if (!empty($stmt->table) && is_array($columns)) { if (!empty($this->currentTable) && is_array($columns)) {
$columns = $this->castFields($stmt->table, $columns); $columns = $this->castFields($this->currentTable, $columns);
} }
break; break;
case self::MYSQLI: case self::MYSQLI:
@ -1520,8 +1522,8 @@ class Database
$result = $this->p($sql, $condition); $result = $this->p($sql, $condition);
if (($this->driver == self::PDO) && !empty($result) && is_string($table)) { if ($this->driver == self::PDO && !empty($result)) {
$result->table = $table; $this->currentTable = $table;
} }
return $result; return $result;