Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Routines uses CHARACTER SET

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@202 7c3ca157-0c34-0410-bff1-cbf682f78f5c
  • Loading branch information...
commit a3c969c0aeccfa303e39e383fdef37d6d270f65c 1 parent ff442a4
jakubvrana authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 editing.inc.php
4 editing.inc.php
View
@@ -68,12 +68,12 @@ function edit_type($key, $field, $collations) {
<?php
}
-function process_type($field) {
+function process_type($field, $collate = "COLLATE") {
global $mysql, $enum_length, $unsigned;
return " $field[type]"
. ($field["length"] ? "(" . (preg_match("~^\\s*(?:$enum_length)(?:\\s*,\\s*(?:$enum_length))*\\s*\$~", $field["length"]) && preg_match_all("~$enum_length~", $field["length"], $matches) ? implode(",", $matches[0]) : intval($field["length"])) . ")" : "")
. (preg_match('~int|float|double|decimal~', $field["type"]) && in_array($field["unsigned"], $unsigned) ? " $field[unsigned]" : "")
- . (preg_match('~char|text|enum|set~', $field["type"]) && $field["collation"] ? " COLLATE '" . $mysql->escape_string($field["collation"]) . "'" : "")
+ . (preg_match('~char|text|enum|set~', $field["type"]) && $field["collation"] ? " $collate '" . $mysql->escape_string($field["collation"]) . "'" : "")
;
}
Please sign in to comment.
Something went wrong with that request. Please try again.