From d51b260470c023fc209177a291546e036b2b100d Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Thu, 5 Jul 2007 14:36:35 +0000
Subject: [PATCH] Unsigned, column collation

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@47 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 create.inc.php    | 41 +++++++++++++++++++++++++++++++----------
 functions.inc.php |  7 ++++---
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/create.inc.php b/create.inc.php
index bfa62657..83517d1e 100644
--- a/create.inc.php
+++ b/create.inc.php
@@ -1,5 +1,6 @@
 <?php
 $types = types();
+$unsigned = array("", "unsigned", "zerofill", "unsigned zerofill");
 if ($_POST && !$_POST["add"]) {
 	if ($_POST["drop"]) {
 		$query = "DROP TABLE " . idf_escape($_GET["create"]);
@@ -9,7 +10,14 @@ if ($_POST && !$_POST["add"]) {
 		ksort($_POST["fields"]);
 		foreach ($_POST["fields"] as $key => $field) {
 			if (strlen($field["field"]) && isset($types[$field["type"]])) {
-				$fields[] = (!strlen($_GET["create"]) ? "" : (strlen($field["orig"]) ? "CHANGE " . idf_escape($field["orig"]) . " " : "ADD ")) . idf_escape($field["field"]) . " $field[type]" . ($field["length"] ? "($field[length])" : "") . ($field["null"] ? "" : " NOT NULL") . ($field["extra"] == "auto_increment" ? " AUTO_INCREMENT PRIMARY KEY" : "");
+				$fields[] = (!strlen($_GET["create"]) ? "" : (strlen($field["orig"]) ? "CHANGE " . idf_escape($field["orig"]) . " " : "ADD "))
+					. idf_escape($field["field"]) . " $field[type]"
+					. ($field["length"] ? "($field[length])" : "")
+					. (preg_match('~int|float|double|decimal~', $field["type"]) && in_array($field["unsigned"], $unsigned) ? " $field[unsigned]" : "")
+					. (preg_match('~char|text~', $field["type"]) && $field["collation"] ? " COLLATE '" . mysql_real_escape_string($field["collation"]) . "'" : "")
+					. ($field["null"] ? "" : " NOT NULL")
+					. ($key == $_POST["auto_increment"] ? " AUTO_INCREMENT PRIMARY KEY" : "") //! drop old primary key, can be part of any index
+				;
 			} elseif (strlen($field["orig"])) {
 				$fields[] = "DROP " . idf_escape($field["orig"]);
 			}
@@ -42,27 +50,29 @@ if ($_POST) {
 } else {
 	$row = array("fields" => array());
 }
-//! collate columns, references, unsigned, zerofill, default
+//! default, comments
+$collations = collations();
 ?>
-<form action="" method="post">
+<form action="" method="post" id="form">
 <p>
 <?php echo lang('Table name'); ?>: <input name="name" maxlength="64" value="<?php echo htmlspecialchars($row["name"]); ?>" />
 <select name="Engine"><option value="">(<?php echo lang('engine'); ?>)</option><?php echo optionlist(engines(), $row["Engine"], "not_vals"); ?></select>
-<select name="Collation"><option value="">(<?php echo lang('collation'); ?>)</option><?php echo optionlist(collations(), $row["Collation"], "not_vals"); ?></select>
+<select name="Collation"><option value="">(<?php echo lang('collation'); ?>)</option><?php echo optionlist($collations, $row["Collation"], "not_vals"); ?></select>
 </p>
 <table border="0" cellspacing="0" cellpadding="2">
-<thead><tr><th><?php echo lang('Name'); ?></th><td><?php echo lang('Type'); ?></td><td><?php echo lang('Length'); ?></td><td><?php echo lang('NULL'); ?></td><td><?php echo lang('Auto-increment'); ?></td></tr></thead>
+<thead><tr><th><?php echo lang('Name'); ?></th><td><?php echo lang('Type'); ?></td><td><?php echo lang('Length'); ?></td><td><?php echo lang('Options'); ?></td><td><?php echo lang('NULL'); ?></td><td><input type="radio" name="auto_increment" value="" /><?php echo lang('Auto-increment'); ?></td></tr></thead>
 <?php
-$i=0;
+$i=1;
 foreach ($row["fields"] as $field) {
 	if (strlen($field["field"])) {
 		?>
 <tr>
 <th><input type="hidden" name="fields[<?php echo $i; ?>][orig]" value="<?php echo htmlspecialchars($field["field"]); ?>" /><input name="fields[<?php echo $i; ?>][field]" value="<?php echo htmlspecialchars($field["field"]); ?>" maxlength="64" /></th>
-<td><select name="fields[<?php echo $i; ?>][type]"><?php echo optionlist(array_keys($types), $field["type"], "not_vals"); ?></select></td>
+<td><select name="fields[<?php echo $i; ?>][type]" onchange="type_change(this);"><?php echo optionlist(array_keys($types), $field["type"], "not_vals"); ?></select></td>
 <td><input name="fields[<?php echo $i; ?>][length]" value="<?php echo htmlspecialchars($field["length"]); ?>" size="3" /></td>
+<td><select name="fields[<?php echo $i; ?>][collation]"><option value="">(<?php echo lang('collation'); ?>)</option><?php echo optionlist($collations, $field["collation"], "not_vals"); ?></select> <select name="fields[<?php echo $i; ?>][unsigned]"><?php echo optionlist($unsigned, $field["unsigned"], "not_vals"); ?></select></td>
 <td><input type="checkbox" name="fields[<?php echo $i; ?>][null]" value="1"<?php if ($field["null"]) { ?> checked="checked"<?php } ?> /></td>
-<td><input type="checkbox" name="fields[<?php echo $i; ?>][extra]" value="auto_increment"<?php if ($field["extra"] == "auto_increment") { ?> checked="checked"<?php } ?> /></td>
+<td><input type="radio" name="auto_increment" value="<?php echo $i; ?>"<?php if ($row["auto_increment"] == $i || $field["extra"] == "auto_increment") { ?> checked="checked"<?php } ?> /></td>
 </tr>
 <?php
 		$i++;
@@ -72,12 +82,23 @@ foreach ($row["fields"] as $field) {
 ?>
 <tr>
 <th><input name="fields[<?php echo $i; ?>][field]" maxlength="64" /></th>
-<td><select name="fields[<?php echo $i; ?>][type]"><?php echo optionlist(array_keys($types), array(), "not_vals"); ?></select></td>
+<td><select name="fields[<?php echo $i; ?>][type]" onchange="type_change(this);"><?php echo optionlist(array_keys($types), array(), "not_vals"); ?></select></td>
 <td><input name="fields[<?php echo $i; ?>][length]" size="3" /></td>
+<td><select name="fields[<?php echo $i; ?>][collation]"><option value="">(<?php echo lang('collation'); ?>)</option><?php echo optionlist($collations, array(), "not_vals"); ?></select> <select name="fields[<?php echo $i; ?>][unsigned]"><?php echo optionlist($unsigned, array(), "not_vals"); ?></select></td>
 <td><input type="checkbox" name="fields[<?php echo $i; ?>][null]" value="1" /></td>
-<td><input type="checkbox" name="fields[<?php echo $i; ?>][extra]" value="auto_increment" /></td>
+<td><input type="radio" name="auto_increment" value="<?php echo $i; ?>" /></td>
 </tr>
 </table>
+<script type="text/javascript">
+function type_change(type) {
+	var name = type.name.substr(0, type.name.length - 6);
+	type.form[name + '[collation]'].style.display = (/char|text/.test(type.form[name + '[type]'].value) ? '' : 'none');
+	type.form[name + '[unsigned]'].style.display = (/int|float|double|decimal/.test(type.form[name + '[type]'].value) ? '' : 'none');
+}
+for (var i=1; <?php echo $i; ?> >= i; i++) {
+	document.getElementById('form')['fields[' + i + '][type]'].onchange();
+}
+</script>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>" />
 <?php if (strlen($_GET["create"])) { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>" /><?php } ?>
diff --git a/functions.inc.php b/functions.inc.php
index cb449a2f..0ad02c65 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -31,17 +31,18 @@ function optionlist($options, $selected = array(), $not_vals = false) {
 
 function fields($table) {
 	$return = array();
-	$result = mysql_query("SHOW COLUMNS FROM " . idf_escape($table));
+	$result = mysql_query("SHOW FULL COLUMNS FROM " . idf_escape($table));
 	while ($row = mysql_fetch_assoc($result)) {
-		preg_match('~^([^(]+)(?:\\((.+)\\))?( unsigned)?$~', $row["Type"], $match);
+		preg_match('~^([^(]+)(?:\\((.+)\\))?( unsigned)?( zerofill)?$~', $row["Type"], $match);
 		$return[$row["Field"]] = array(
 			"field" => $row["Field"],
 			"type" => $match[1],
 			"length" => $match[2],
-			"unsigned" => $match[3],
+			"unsigned" => ltrim($match[3] . $match[4]),
 			"default" => $row["Default"],
 			"null" => ($row["Null"] != "NO"),
 			"extra" => $row["Extra"],
+			"collation" => $row["Collation"],
 		);
 	}
 	mysql_free_result($result);