mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-08 07:36:44 +02:00
Code Issues Releases Wiki Activity

Use utf8mb4 on more places

Browse Source
This commit is contained in:
Jakub Vrana
2014-06-26 13:22:35 +02:00
parent b87d43fdcd
commit 8bd3dca2f7
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
adminer/include/functions.inc.php
View File

@@ -65,6 +65,14 @@ function bracket_escape($idf, $back = false) {
return strtr($idf, ($back ? array_flip($trans) : $trans));
}
/** Get connection charset
* @param Min_DB
* @return string
*/
function charset($connection) {
return (version_compare($connection->server_info, "5.5.3") > 0 ? "utf8mb4" : "utf8"); // SHOW CHARSET would require an extra query
}
/** Escape for HTML
* @param string
* @return string
@@ -373,7 +381,7 @@ function unique_array($row, $indexes) {
* @return string
*/
function where($where, $fields = array()) {
global $jush;
global $connection, $jush;
$return = array();
$function_pattern = '(^[\w\(]+(' . str_replace("_", ".*", preg_quote(idf_escape("_"))) . ')?\)+$)'; //! columns looking like functions
foreach ((array) $where["where"] as $key => $val) {
@@ -386,7 +394,7 @@ function where($where, $fields = array()) {
) // LIKE because of floats but slow with ints, in MS SQL because of text
; //! enum and set
if ($jush == "sql" && preg_match('~char|text~', $fields[$key]["type"]) && preg_match("~[^ -@]~", $val)) { // not just [a-z] to catch non-ASCII characters
$return[] = "$column = " . q($val) . " COLLATE utf8_bin";
$return[] = "$column = " . q($val) . " COLLATE " . charset($connection) . "_bin";
}
}
foreach ((array) $where["null"] as $key) {