return $sql;
}
+ /**
+ * @brief beautifies the query - useful for "SHOW PROCESSLIST"
+ *
+ * This is safe when we bind the parameters later.
+ * The parameter values aren't part of the SQL.
+ *
+ * @param string $sql An SQL string without the values
+ * @return string The input SQL string modified if necessary.
+ */
+ public function clean_query($sql) {
+ $search = array("\t", "\n", "\r", " ");
+ $replace = array(' ', ' ', ' ', ' ');
+ do {
+ $oldsql = $sql;
+ $sql = str_replace($search, $replace, $sql);
+ } while ($oldsql != $sql);
+
+ return $sql;
+ }
+
+
/**
* @brief Replaces the ? placeholders with the parameters in the $args array
*
logger('Parameter mismatch. Query "'.$sql.'" - Parameters '.print_r($args, true), LOGGER_DEBUG);
}
+ $sql = self::$dbo->clean_query($sql);
$sql = self::$dbo->any_value_fallback($sql);
if (x($a->config,'system') && x($a->config['system'], 'db_callstack')) {
* @return int Number of rows
*/
static public function num_rows($stmt) {
+ if (!is_object($stmt)) {
+ return 0;
+ }
switch (self::$dbo->driver) {
case 'pdo':
return $stmt->rowCount();
}
/**
- * @brief Insert a row into a table
+ * @brief Delete a row from a table
*
* @param string $table Table name
* @param array $param parameter array
if (!$in_process) {
// Now we finalize the process
- if (!self::$in_transaction) {
+ $do_transaction = !self::$in_transaction;
+
+ if ($do_transaction) {
self::transaction();
}
logger(dba::replace_parameters($sql, $command['param']), LOGGER_DATA);
if (!self::e($sql, $command['param'])) {
- if (!self::$in_transaction) {
+ if ($do_transaction) {
self::rollback();
}
return false;
logger(dba::replace_parameters($sql, $field_values), LOGGER_DATA);
if (!self::e($sql, $field_values)) {
- if (!self::$in_transaction) {
+ if ($do_transaction) {
self::rollback();
}
return false;
}
}
}
- if (!self::$in_transaction) {
+ if ($do_transaction) {
self::commit();
}
return true;
unset($args[0]);
if ($db && $db->connected) {
+ $sql = $db->clean_query($sql);
$sql = $db->any_value_fallback($sql);
$stmt = @vsprintf($sql,$args); // Disabled warnings
//logger("dba: q: $stmt", LOGGER_ALL);
unset($args[0]);
if ($db && $db->connected) {
+ $sql = $db->clean_query($sql);
$sql = $db->any_value_fallback($sql);
$stmt = @vsprintf($sql,$args); // Disabled warnings
if ($stmt === false)