strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add support for empty values array in Database\DBA

Browse source
This commit is contained in:
Hypolite Petovan 2019-12-24 16:21:00 -05:00
parent 2056e6a5c4
commit 9c9e07dbab
1 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Database/DBA.php
View file

@ -543,6 +543,7 @@ class DBA extends BaseObject
$condition_string .= " AND "; $condition_string .= " AND ";
} }
if (is_array($value)) { if (is_array($value)) {
if (count($value)) {
/* Workaround for MySQL Bug #64791. /* Workaround for MySQL Bug #64791.
* Never mix data types inside any IN() condition. * Never mix data types inside any IN() condition.
* In case of mixed types, cast all as string. * In case of mixed types, cast all as string.
@ -570,6 +571,10 @@ class DBA extends BaseObject
$new_values = array_merge($new_values, array_values($value)); $new_values = array_merge($new_values, array_values($value));
$placeholders = substr(str_repeat("?, ", count($value)), 0, -2); $placeholders = substr(str_repeat("?, ", count($value)), 0, -2);
$condition_string .= self::quoteIdentifier($field) . " IN (" . $placeholders . ")"; $condition_string .= self::quoteIdentifier($field) . " IN (" . $placeholders . ")";
} else {
// Empty value array isn't supported by IN and is logically equivalent to no match
$condition_string .= "FALSE";
}
} elseif (is_null($value)) { } elseif (is_null($value)) {
$condition_string .= self::quoteIdentifier($field) . " IS NULL"; $condition_string .= self::quoteIdentifier($field) . " IS NULL";
} else { } else {