From e7c79f872573a16ea5fb30b707c71a3a86c692e0 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Sat, 6 Jul 2013 23:05:27 -0700
Subject: [PATCH] Mark length as required for strings

Uses <input formnovalidate> instead of <form novalidate> to highlight error fields.
---
 adminer/create.inc.php          | 6 +++---
 adminer/include/editing.inc.php | 2 +-
 adminer/static/editing.js       | 1 +
 changes.txt                     | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index 1bb8715d..0c85ac44 100644
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -158,7 +158,7 @@ foreach ($engines as $engine) {
 <?php if ($TABLE == "" && !$_POST) { ?><script type='text/javascript'>focus(document.getElementById('form')['name']);</script><?php } ?>
 <?php echo ($engines ? html_select("Engine", array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) : ""); ?>
  <?php echo ($collations && !ereg("sqlite|mssql", $jush) ? html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?>
- <input type="submit" value="<?php echo lang('Save'); ?>">
+ <input type="submit" value="<?php echo lang('Save'); ?>" formnovalidate>
 <table cellspacing="0" id="edit-fields" class="nowrap">
 <?php
 $comments = ($_POST ? $_POST["comments"] : $row["Comment"] != "");
@@ -183,8 +183,8 @@ edit_fields($row["fields"], $collations, "TABLE", $foreign_keys, $comments);
 	: '')
 ; ?>
 <p>
-<input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($TABLE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
+<input type="submit" value="<?php echo lang('Save'); ?>" formnovalidate>
+<?php if ($TABLE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?> formnovalidate><?php } ?>
 <?php
 if (support("partitioning")) {
 	$partition_table = ereg('RANGE|LIST', $row["partition_by"]);
diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 02107f6d..814e6778 100644
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -140,7 +140,7 @@ function edit_type($key, $field, $collations, $foreign_keys = array()) {
 	global $structured_types, $types, $unsigned, $on_actions;
 	?>
 <td><select name="<?php echo $key; ?>[type]" class="type" onfocus="lastType = selectValue(this);" onchange="editingTypeChange(this);"><?php echo optionlist((!$field["type"] || isset($types[$field["type"]]) ? array() : array($field["type"])) + $structured_types + ($foreign_keys ? array(lang('Foreign keys') => $foreign_keys) : array()), $field["type"]); ?></select>
-<td><input name="<?php echo $key; ?>[length]" value="<?php echo h($field["length"]); ?>" size="3" onfocus="editingLengthFocus(this);"><td class="options"><?php //! type="number" with enabled JavaScript
+<td><input name="<?php echo $key; ?>[length]" value="<?php echo h($field["length"]); ?>" size="3" onfocus="editingLengthFocus(this);"<?php echo (ereg('var(char|binary)$', $field["type"]) ? " required" : ""); ?>><td class="options"><?php //! type="number" with enabled JavaScript
 	echo "<select name='$key" . "[collation]'" . (ereg('(char|text|enum|set)$', $field["type"]) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>';
 	echo ($unsigned ? "<select name='$key" . "[unsigned]'" . (!$field["type"] || ereg('((^|[^o])int|float|double|decimal)$', $field["type"]) ? "" : " class='hidden'") . '><option>' . optionlist($unsigned, $field["unsigned"]) . '</select>' : '');
 	echo (isset($field['on_update']) ? "<select name='$key" . "[on_update]'" . ($field["type"] == "timestamp" ? "" : " class='hidden'") . '>' . optionlist(array("" => "(" . lang('ON UPDATE') . ")", "CURRENT_TIMESTAMP"), $field["on_update"]) . '</select>' : '');
diff --git a/adminer/static/editing.js b/adminer/static/editing.js
index 10dd68d7..4fc0233c 100644
--- a/adminer/static/editing.js
+++ b/adminer/static/editing.js
@@ -358,6 +358,7 @@ function editingTypeChange(type) {
 			(/(char|binary)$/.test(lastType) && /(char|binary)$/.test(text))
 			|| (/(enum|set)$/.test(lastType) && /(enum|set)$/.test(text))
 		)) {
+			el.required = /var(char|binary)$/.test(text);
 			el.value = '';
 		}
 		if (lastType == 'timestamp' && el.name == name + '[has_default]' && /timestamp/i.test(formField(type.form, name + '[default]').value)) {
diff --git a/changes.txt b/changes.txt
index 9560a441..259c6974 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,6 +1,7 @@
 Adminer 3.7.2-dev:
 Save and continue edit by AJAX
 Add a new column in alter table on key press
+Mark length as required for strings
 PostgreSQL: Fix handling of nextval() default values
 
 Adminer 3.7.1 (released 2013-06-29):