mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #4532 from annando/dba-array

Browse source 
[develop] We now accept array as condition parameters
This commit is contained in:
Hypolite Petovan 2018-03-03 18:14:19 -05:00 committed by GitHub
commit 7bd4a52156
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
include/dba.php
View file

@ -145,7 +145,7 @@ class dba {
* *
* @param string $query The database query that will be analyzed * @param string $query The database query that will be analyzed
*/ */
private static function log_index($query) { private static function logIndex($query) {
$a = get_app(); $a = get_app();
if (empty($a->config["system"]["db_log_index"])) { if (empty($a->config["system"]["db_log_index"])) {
@ -272,7 +272,7 @@ class dba {
* @param array $args The parameters that are to replace the ? placeholders * @param array $args The parameters that are to replace the ? placeholders
* @return string The replaced SQL query * @return string The replaced SQL query
*/ */
private static function replace_parameters($sql, $args) { private static function replaceParameters($sql, $args) {
$offset = 0; $offset = 0;
foreach ($args AS $param => $value) { foreach ($args AS $param => $value) {
if (is_int($args[$param]) || is_float($args[$param])) { if (is_int($args[$param]) || is_float($args[$param])) {
@ -413,7 +413,7 @@ class dba {
// The fallback routine is called as well when there are no arguments // The fallback routine is called as well when there are no arguments
if (!$can_be_prepared || (count($args) == 0)) { if (!$can_be_prepared || (count($args) == 0)) {
$retval = self::$db->query(self::replace_parameters($sql, $args)); $retval = self::$db->query(self::replaceParameters($sql, $args));
if (self::$db->errno) { if (self::$db->errno) {
self::$error = self::$db->error; self::$error = self::$db->error;
self::$errorno = self::$db->errno; self::$errorno = self::$db->errno;
@ -476,7 +476,7 @@ class dba {
$errorno = self::$errorno; $errorno = self::$errorno;
logger('DB Error '.self::$errorno.': '.self::$error."\n". logger('DB Error '.self::$errorno.': '.self::$error."\n".
System::callstack(8)."\n".self::replace_parameters($sql, $params)); System::callstack(8)."\n".self::replaceParameters($sql, $params));
self::$error = $error; self::$error = $error;
self::$errorno = $errorno; self::$errorno = $errorno;
@ -496,7 +496,7 @@ class dba {
@file_put_contents($a->config["system"]["db_log"], DateTimeFormat::utcNow()."\t".$duration."\t". @file_put_contents($a->config["system"]["db_log"], DateTimeFormat::utcNow()."\t".$duration."\t".
basename($backtrace[1]["file"])."\t". basename($backtrace[1]["file"])."\t".
$backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t". $backtrace[1]["line"]."\t".$backtrace[2]["function"]."\t".
substr(self::replace_parameters($sql, $args), 0, 2000)."\n", FILE_APPEND); substr(self::replaceParameters($sql, $args), 0, 2000)."\n", FILE_APPEND);
} }
} }
return $retval; return $retval;
@ -541,7 +541,7 @@ class dba {
$errorno = self::$errorno; $errorno = self::$errorno;
logger('DB Error '.self::$errorno.': '.self::$error."\n". logger('DB Error '.self::$errorno.': '.self::$error."\n".
System::callstack(8)."\n".self::replace_parameters($sql, $params)); System::callstack(8)."\n".self::replaceParameters($sql, $params));
self::$error = $error; self::$error = $error;
self::$errorno = $errorno; self::$errorno = $errorno;
@ -567,10 +567,10 @@ class dba {
$fields = []; $fields = [];
$array_element = each($condition); reset($condition);
$array_key = $array_element['key']; $first_key = key($condition);
if (!is_int($array_key)) { if (!is_int($first_key)) {
$fields = [$array_key]; $fields = [$first_key];
} }
$stmt = self::select($table, $fields, $condition, ['limit' => 1]); $stmt = self::select($table, $fields, $condition, ['limit' => 1]);
@ -846,7 +846,7 @@ class dba {
* *
* This process must only be started once, since the value is cached. * This process must only be started once, since the value is cached.
*/ */
private static function build_relation_data() { private static function buildRelationData() {
$definition = DBStructure::definition(); $definition = DBStructure::definition();
foreach ($definition AS $table => $structure) { foreach ($definition AS $table => $structure) {
@ -895,7 +895,7 @@ class dba {
// To speed up the whole process we cache the table relations // To speed up the whole process we cache the table relations
if (count(self::$relation) == 0) { if (count(self::$relation) == 0) {
self::build_relation_data(); self::buildRelationData();
} }
// Is there a relation entry for the table? // Is there a relation entry for the table?
@ -950,17 +950,14 @@ class dba {
foreach ($commands AS $command) { foreach ($commands AS $command) {
$conditions = $command['conditions']; $conditions = $command['conditions'];
$array_element = each($conditions); reset($conditions);
$array_key = $array_element['key']; $first_key = key($conditions);
if (is_int($array_key)) {
$condition_string = " WHERE " . array_shift($conditions);
} else {
$condition_string = " WHERE `" . implode("` = ? AND `", array_keys($conditions)) . "` = ?";
}
if ((count($command['conditions']) > 1) || is_int($array_key)) { $condition_string = self::buildCondition($conditions);
if ((count($command['conditions']) > 1) || is_int($first_key)) {
$sql = "DELETE FROM `" . $command['table'] . "`" . $condition_string; $sql = "DELETE FROM `" . $command['table'] . "`" . $condition_string;
logger(self::replace_parameters($sql, $conditions), LOGGER_DATA); logger(self::replaceParameters($sql, $conditions), LOGGER_DATA);
if (!self::e($sql, $conditions)) { if (!self::e($sql, $conditions)) {
if ($do_transaction) { if ($do_transaction) {
@ -990,7 +987,7 @@ class dba {
$sql = "DELETE FROM `" . $table . "` WHERE `" . $field . "` IN (" . $sql = "DELETE FROM `" . $table . "` WHERE `" . $field . "` IN (" .
substr(str_repeat("?, ", count($field_values)), 0, -2) . ");"; substr(str_repeat("?, ", count($field_values)), 0, -2) . ");";
logger(self::replace_parameters($sql, $field_values), LOGGER_DATA); logger(self::replaceParameters($sql, $field_values), LOGGER_DATA);
if (!self::e($sql, $field_values)) { if (!self::e($sql, $field_values)) {
if ($do_transaction) { if ($do_transaction) {
@ -1047,13 +1044,7 @@ class dba {
$table = self::escape($table); $table = self::escape($table);
$array_element = each($condition); $condition_string = self::buildCondition($condition);
$array_key = $array_element['key'];
if (is_int($array_key)) {
$condition_string = " WHERE ".array_shift($condition);
} else {
$condition_string = " WHERE `".implode("` = ? AND `", array_keys($condition))."` = ?";
}
if (is_bool($old_fields)) { if (is_bool($old_fields)) {
$do_insert = $old_fields; $do_insert = $old_fields;
@ -1148,6 +1139,8 @@ class dba {
return false; return false;
} }
$table = self::escape($table);
if (count($fields) > 0) { if (count($fields) > 0) {
$select_fields = "`" . implode("`, `", array_values($fields)) . "`"; $select_fields = "`" . implode("`, `", array_values($fields)) . "`";
} else { } else {
@ -1239,12 +1232,28 @@ class dba {
{ {
$condition_string = ''; $condition_string = '';
if (count($condition) > 0) { if (count($condition) > 0) {
$array_element = each($condition); reset($condition);
$array_key = $array_element['key']; $first_key = key($condition);
if (is_int($array_key)) { if (is_int($first_key)) {
$condition_string = " WHERE ".array_shift($condition); $condition_string = " WHERE ".array_shift($condition);
} else { } else {
$condition_string = " WHERE `".implode("` = ? AND `", array_keys($condition))."` = ?"; $new_values = [];
$condition_string = "";
foreach ($condition as $field => $value) {
if ($condition_string != "") {
$condition_string .= " AND ";
}
if (is_array($value)) {
$new_values = array_merge($new_values, array_values($value));
$placeholders = substr(str_repeat("?, ", count($value)), 0, -2);
$condition_string .= "`" . $field . "` IN (" . $placeholders . ")";
} else {
$new_values[$field] = $value;
$condition_string .= "`" . $field . "` = ?";
}
}
$condition_string = " WHERE " . $condition_string;
$condition = $new_values;
} }
} }