protected $dbaDefinition;
/** @var ViewDefinition */
protected $viewDefinition;
+ /** @var string|null */
+ private $currentTable;
public function __construct(IManageConfigValues $config, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition)
{
*/
public function p(string $sql)
{
-
+ $this->currentTable = null;
$this->profiler->startRecording('database');
$stamp1 = microtime(true);
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);
$this->logger->error('DB Error', [
'code' => $errorno,
'error' => $error,
- 'callstack' => System::callstack(8),
'params' => $this->replaceParameters($sql, $args),
]);
@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
);
$this->logger->error('DB Error', [
'code' => $errorno,
'error' => $error,
- 'callstack' => System::callstack(8),
'params' => $this->replaceParameters($sql, $params),
]);
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:
$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);
}
$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;