tobias/friendica
1
0
Fork 0
Code Pull requests Activity

We now accept array as condition parameters

Browse source
This commit is contained in:
Michael 2018-03-03 08:47:13 +00:00
parent 38e5e64532
commit 5bda6c7f6d
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
include/dba.php
View file

@ -950,13 +950,7 @@ class dba {
foreach ($commands AS $command) { foreach ($commands AS $command) {
$conditions = $command['conditions']; $conditions = $command['conditions'];
$array_element = each($conditions); $condition_string = self::buildCondition($conditions);
$array_key = $array_element['key'];
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)) { if ((count($command['conditions']) > 1) || is_int($array_key)) {
$sql = "DELETE FROM `" . $command['table'] . "`" . $condition_string; $sql = "DELETE FROM `" . $command['table'] . "`" . $condition_string;
@ -1047,13 +1041,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 +1136,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 {
@ -1235,16 +1225,32 @@ class dba {
* @param array $condition * @param array $condition
* @return string * @return string
*/ */
private static function buildCondition(array &$condition = []) private static function buildCondition(&$condition = [])
{ {
$condition_string = ''; $condition_string = '';
if (count($condition) > 0) { if (is_array($condition) && (count($condition) > 0)) {
$array_element = each($condition); $array_element = each($condition);
$array_key = $array_element['key']; $array_key = $array_element['key'];
if (is_int($array_key)) { if (is_int($array_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[] = $value;
$condition_string .= "`" . $field . "` = ?";
}
}
$condition_string = " WHERE " . $condition_string;
$condition = $new_values;
} }
} }