From a3c969c0aeccfa303e39e383fdef37d6d270f65c Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Tue, 17 Jul 2007 05:51:09 +0000
Subject: [PATCH] Routines uses CHARACTER SET

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@202 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 editing.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/editing.inc.php b/editing.inc.php
index a733baab..961d9ebb 100644
--- a/editing.inc.php
+++ b/editing.inc.php
@@ -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"]) . "'" : "")
 	;
 }