Respect function results in where()
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@441 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
parent
9ea31125a0
commit
581bd35045
|
@ -141,10 +141,12 @@ function where($where) {
|
||||||
global $mysql;
|
global $mysql;
|
||||||
$return = array();
|
$return = array();
|
||||||
foreach ((array) $where["where"] as $key => $val) {
|
foreach ((array) $where["where"] as $key => $val) {
|
||||||
$return[] = idf_escape(bracket_escape($key, "back")) . " = BINARY '" . $mysql->escape_string($val) . "'"; //! enum and set
|
$key = bracket_escape($key, "back");
|
||||||
|
$return[] = (preg_match('~^[A-Z0-9_]+\\(`(?:[^`]+|``)+`\\)$~', $key) ? $key : idf_escape($key)) . " = BINARY '" . $mysql->escape_string($val) . "'"; //! enum and set, columns looking like functions
|
||||||
}
|
}
|
||||||
foreach ((array) $where["null"] as $key) {
|
foreach ((array) $where["null"] as $key) {
|
||||||
$return[] = idf_escape(bracket_escape($key, "back")) . " IS NULL";
|
$key = bracket_escape($key, "back");
|
||||||
|
$return[] = (preg_match('~^[A-Z0-9_]+\\(`(?:[^`]+|``)+`\\)$~', $key) ? $key : idf_escape($key)) . " IS NULL";
|
||||||
}
|
}
|
||||||
return $return;
|
return $return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue