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 @@ $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(); ?> -