mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-17 20:01:25 +02:00
Code Issues Releases Wiki Activity

MySQL: Support non-utf8 charset in search in column

Browse Source
This commit is contained in:
Jakub Vrana
2018-02-06 13:19:12 +01:00
parent c2de3b8ec1
commit 197abdcb70
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
adminer/include/adminer.inc.php
View File

@@ -504,7 +504,7 @@ class Adminer {
* @return array expressions to join by AND
*/
function selectSearchProcess($fields, $indexes) {
global $connection, $jush;
global $connection, $driver;
$return = array();
foreach ($indexes as $i => $index) {
if ($index["type"] == "FULLTEXT" && $_GET["fulltext"][$i] != "") {
@@ -534,17 +534,15 @@ class Adminer {
$cond .= " " . $this->processInput($fields[$val["col"]], $val["val"]);
}
if ($val["col"] != "") {
$return[] = $prefix . idf_escape($val["col"]) . $cond;
$return[] = $prefix . $driver->convertSearch(idf_escape($val["col"]), $fields[$val["col"]]) . $cond;
} else {
// find anywhere
$cols = array();
foreach ($fields as $name => $field) {
$is_text = preg_match('~char|text|enum|set~', $field["type"]);
if ((is_numeric($val["val"]) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
&& (!preg_match("~[\x80-\xFF]~", $val["val"]) || $is_text)
&& (!preg_match("~[\x80-\xFF]~", $val["val"]) || preg_match('~char|text|enum|set~', $field["type"]))
) {
$name = idf_escape($name);
$cols[] = $prefix . ($jush == "sql" && $is_text && !preg_match("~^utf8~", $field["collation"]) ? "CONVERT($name USING " . charset($connection) . ")" : $name) . $cond;
$cols[] = $prefix . $driver->convertSearch(idf_escape($name), $field) . $cond;
}
}
$return[] = ($cols ? "(" . implode(" OR ", $cols) . ")" : "1 = 0");

9
adminer/include/driver.inc.php
View File

@@ -113,6 +113,15 @@
return queries("ROLLBACK");
}
/** Convert column to be searchable
* @param string escaped name
* @param array
* @return string
*/
function convertSearch($idf, $field) {
return $idf;
}
/** Get warnings about the last command
* @return string HTML
*/