beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Alter bit type default value

Browse source
This commit is contained in:
Jakub Vrana 2011-05-16 16:14:11 +02:00
parent cbdf09d868
commit 4ff2f03a0f
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
adminer/include/adminer.inc.php
View file

@ -472,7 +472,7 @@ username.form['driver'].onchange();
return $value; // SQL injection
}
$name = $field["field"];
$return = ($field["type"] == "bit" && ereg('^[0-9]+$', $value) ? $value : q($value));
$return = ($field["type"] == "bit" && ereg("^([0-9]+|b'[0-1]+')\$", $value) ? $value : q($value));
if (ereg('^(now|getdate|uuid)$', $function)) {
$return = "$function()";
} elseif (ereg('^current_(date|timestamp)$', $function)) {
@ -784,6 +784,7 @@ DROP PROCEDURE adminer_alter;
foreach (array("bac", "bra", "sqlite_quo", "mssql_bra") as $val) {
echo "jushLinks.$val = jushLinks.$jush;\n";
}
echo "var cmComplete = [ '" . implode("', '", array_map('js_escape', array_keys($tables))) . "' ];\n";
echo "</script>\n";
}
}

2
adminer/include/editing.inc.php
View file

@ -176,7 +176,7 @@ function process_field($field, $type_field) {
idf_escape($field["field"]),
process_type($type_field),
($field["null"] ? " NULL" : " NOT NULL"), // NULL for timestamp
(isset($field["default"]) ? " DEFAULT " . (($field["type"] == "timestamp" && eregi('^CURRENT_TIMESTAMP$', $field["default"])) || ($field["type"] == "bit" && ereg('^[0-9]+$', $field["default"])) ? $field["default"] : q($field["default"])) : ""),
(isset($field["default"]) ? " DEFAULT " . (($field["type"] == "timestamp" && eregi('^CURRENT_TIMESTAMP$', $field["default"])) || ($field["type"] == "bit" && ereg("^([0-9]+|b'[0-1]+')\$", $field["default"])) ? $field["default"] : q($field["default"])) : ""),
($field["on_update"] ? " ON UPDATE $field[on_update]" : ""),
(support("comment") && $field["comment"] != "" ? " COMMENT " . q($field["comment"]) : ""),
($field["auto_increment"] ? auto_increment() : null),

1
changes.txt
View file

@ -2,6 +2,7 @@ Adminer 3.3.0-dev:
Use Esc to disable in-place edit
Highlight SQL code in textarea
Append new index with auto index selection (bug #3282127)
Bit type default value
Autocomplete for big foreign keys (Editor)
Customizable favicon (customization)
Method name can return a link (customization)