Alter bit type default value

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 420ab06f32d6a7a3b51802999eee03166d4ae863..0c40cd104d5f10c5ea326a81c6e586f9187a6b30 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -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";
                                        }
                                }

diff --git a/adminer/include/editing.inc.php b/adminer/include/editing.inc.php
index 759954ba6532a92b238686609276c4a4e0830487..00c61a2c40b829a8cfe58581809c5d3d63f2f14f 100644 (file)
--- a/adminer/include/editing.inc.php
+++ b/adminer/include/editing.inc.php
@@ -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),

diff --git a/changes.txt b/changes.txt
index 518684a33173e8fbe255397ab3e911a331eb9f9a..c196395690ba4b0224234d484ac0077135ae488d 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -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)