protected $dbaDefinition;
/** @var ViewDefinition */
protected $viewDefinition;
+ /** @var string|null */
+ private $currentTable;
public function __construct(IManageConfigValues $config, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition)
{
*
* @return void
*
- * @todo Make this method obsolet - use a clean pattern instead ...
+ * @todo Make this method obsolete - use a clean pattern instead ...
*/
public function setDependency(IManageConfigValues $config, Profiler $profiler, LoggerInterface $logger)
{
*/
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
);
*
* @param string $sql SQL statement
*
- * @return boolean Was the query successfull? False is returned only if an error occurred
+ * @return boolean Was the query successful? False is returned only if an error occurred
* @throws \Exception
*/
public function e(string $sql): bool
$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);
}
* @param array|boolean $old_fields array with the old field values that are about to be replaced (true = update on duplicate, false = don't update identical fields)
* @param array $params Parameters: "ignore" If set to "true" then the update is done with the ignore parameter
*
- * @return boolean was the update successfull?
+ * @return boolean was the update successful?
* @throws \Exception
* @todo Implement "bool $update_on_duplicate" to avoid mixed type for $old_fields
*/
}
$fields = $this->castFields($table, $fields);
+ $direct_fields = [];
+
+ foreach ($fields as $key => $value) {
+ if (is_numeric($key)) {
+ $direct_fields[] = $value;
+ unset($fields[$key]);
+ }
+ }
+
$table_string = DBA::buildTableString([$table]);
}
$sql = "UPDATE " . $ignore . $table_string . " SET "
- . implode(" = ?, ", array_map([DBA::class, 'quoteIdentifier'], array_keys($fields))) . " = ?"
+ . ((count($fields) > 0) ? implode(" = ?, ", array_map([DBA::class, 'quoteIdentifier'], array_keys($fields))) . " = ?" : "")
+ . ((count($direct_fields) > 0) ? ((count($fields) > 0) ? " , " : "") . implode(" , ", $direct_fields) : "")
. $condition_string;
// Combines the updated fields parameter values with the condition parameter values
$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;
return (['list' => $statelist, 'amount' => $processes]);
}
+ /**
+ * Optimizes tables
+ *
+ * @param string $table a given table
+ *
+ * @return bool True, if successfully optimized, otherwise false
+ * @throws \Exception
+ */
+ public function optimizeTable(string $table): bool
+ {
+ return $this->e("OPTIMIZE TABLE " . DBA::buildTableString([$table])) !== false;
+ }
+
+ /**
+ * Kill sleeping database processes
+ *
+ * @return void
+ */
+ public function deleteSleepingProcesses()
+ {
+ $processes = $this->p("SHOW FULL PROCESSLIST");
+ while ($process = $this->fetch($processes)) {
+ if (($process['Command'] != 'Sleep') || ($process['Time'] < 300) || ($process['db'] != $this->databaseName())) {
+ continue;
+ }
+
+ $this->e("KILL ?", $process['Id']);
+ }
+ $this->close($processes);
+ }
+
/**
* Fetch a database variable
*