From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Wed, 22 Jul 2009 10:48:47 +0000 (+0000)
Subject: Revert type group description separation for performance reasons
X-Git-Tag: v3.0.0~656
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=c8dd281546c59e0ea055c1dde779cdb4eb6b3f61;p=adminer.git

Revert type group description separation for performance reasons

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@871 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 7156bcce..8d139513 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -20,7 +20,7 @@ function referencable_primary($self) {
 function edit_type($key, $field, $collations, $foreign_keys = array()) {
 	global $structured_types, $unsigned, $inout;
 	?>
-<td><select name="<?php echo $key; ?>[type]" onchange="editing_type_change(this);"><?php echo optionlist(array_combine(array(lang('Numbers'), lang('Date and time'), lang('Strings'), lang('Binary'), lang('Lists')), array_map('array_keys', $structured_types)) + ($foreign_keys ? array(lang('Foreign keys') => $foreign_keys) : array()), $field["type"]); ?></select>
+<td><select name="<?php echo $key; ?>[type]" onchange="editing_type_change(this);"><?php echo optionlist($structured_types + ($foreign_keys ? array(lang('Foreign keys') => $foreign_keys) : array()), $field["type"]); ?></select>
 <td><input name="<?php echo $key; ?>[length]" value="<?php echo htmlspecialchars($field["length"]); ?>" size="3">
 <td><?php
 echo "<select name=\"$key" . '[collation]"' . (ereg('(char|text|enum|set)$', $field["type"]) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>';
diff --git a/adminer/include/mysql.inc.php b/adminer/include/mysql.inc.php
index fbc6731d..a4377651 100644
--- a/adminer/include/mysql.inc.php
+++ b/adminer/include/mysql.inc.php
@@ -340,15 +340,16 @@ function information_schema($db) {
 }
 
 // value means maximum unsigned length
-$structured_types = array(
-	array("tinyint" => 3, "smallint" => 5, "mediumint" => 8, "int" => 10, "bigint" => 20, "float" => 12, "double" => 21, "decimal" => 66),
-	array("date" => 10, "datetime" => 19, "timestamp" => 19, "time" => 10, "year" => 4),
-	array("char" => 255, "varchar" => 65535, "tinytext" => 255, "text" => 65535, "mediumtext" => 16777215, "longtext" => 4294967295),
-	array("binary" => 255, "varbinary" => 65535, "tinyblob" => 255, "blob" => 65535, "mediumblob" => 16777215, "longblob" => 4294967295),
-	array("enum" => 65535, "set" => 64),
-);
 $types = array();
-foreach ($structured_types as $val) {
+$structured_types = array();
+foreach (array(
+	lang('Numbers') => array("tinyint" => 3, "smallint" => 5, "mediumint" => 8, "int" => 10, "bigint" => 20, "float" => 12, "double" => 21, "decimal" => 66),
+	lang('Date and time') => array("date" => 10, "datetime" => 19, "timestamp" => 19, "time" => 10, "year" => 4),
+	lang('Strings') => array("char" => 255, "varchar" => 65535, "tinytext" => 255, "text" => 65535, "mediumtext" => 16777215, "longtext" => 4294967295),
+	lang('Binary') => array("binary" => 255, "varbinary" => 65535, "tinyblob" => 255, "blob" => 65535, "mediumblob" => 16777215, "longblob" => 4294967295),
+	lang('Lists') => array("enum" => 65535, "set" => 64),
+) as $key => $val) {
 	$types += $val;
+	$structured_types[$key] = array_keys($val);
 }
 $unsigned = array("unsigned", "zerofill", "unsigned zerofill");