Better support for bit data type

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 5e2f3adf13e50e5550fc195ffd124790b704a9ab..65e0dffc1b16d9251596243161e135a0703e2bc1 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -459,7 +459,7 @@ username.form['driver'].onchange();
        */
        function processInput($field, $value, $function = "") {
                $name = $field["field"];
-               $return = q($value);
+               $return = ($field["type"] == "bit" && ereg('^[0-9]+$', $value) ? $value : q($value));
                if (ereg('^(now|getdate|uuid)$', $function)) {
                        $return = "$function()";
                } elseif (ereg('^current_(date|timestamp)$', $function)) {

diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index d5fc28c6a8b2b5218f66133cd1724760ea887465..fddcc6254f920d797ab15c2803ce53181236fb9c 100644 (file)
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -164,13 +164,13 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
                                $return = "<img src='$link' alt='$return'>";
                        }
                }
-               if ($field["full_type"] == "tinyint(1)" && $return != "&nbsp;") { // bool
+               if (ereg("(tinyint|bit)\\(1\\)", $field["full_type"]) && $return != "&nbsp;") { // bool
                        $return = '<img src="' . ($val ? "../adminer/static/plus.gif" : "../adminer/static/cross.gif") . '" alt="' . h($val) . '">';
                }
                if ($link) {
                        $return = "<a href='$link'>$return</a>";
                }
-               if (!$link && $field["full_type"] != "tinyint(1)" && ereg('int|float|double|decimal', $field["type"])) {
+               if (!$link && !ereg("(tinyint|bit)\\(1\\)", $field["full_type"]) && ereg('int|float|double|decimal', $field["type"])) {
                        $return = "<div class='number'>$return</div>"; // Firefox doesn't support <colgroup>
                } elseif (ereg('date', $field["type"])) {
                        $return = "<div class='datetime'>$return</div>";
@@ -388,7 +388,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
                if ($field["null"] && ereg('blob', $field["type"])) {
                        $return["NULL"] = lang('empty');
                }
-               $return[""] = ($field["null"] || $field["auto_increment"] || $field["full_type"] == "tinyint(1)" ? "" : "*");
+               $return[""] = ($field["null"] || $field["auto_increment"] || ereg("(tinyint|bit)\\(1\\)", $field["full_type"]) ? "" : "*");
                //! respect driver
                if (ereg('date|time', $field["type"])) {
                        $return["now"] = lang('now');
@@ -409,7 +409,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
                if ($options) {
                        return "<select$attrs>" . optionlist($options, $value, true) . "</select>";
                }
-               if ($field["full_type"] == "tinyint(1)") { // bool
+               if (ereg("(tinyint|bit)\\(1\\)", $field["full_type"])) { // bool
                        return '<input type="checkbox" value="' . h($value ? $value : 1) . '"' . ($value ? ' checked' : '') . "$attrs>";
                }
                if (ereg('date|timestamp', $field["type"])) {
@@ -429,8 +429,8 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
                if (ereg('date|timestamp', $field["type"]) && preg_match('(^' . str_replace('\\$1', '(?P<p1>\\d*)', preg_replace('~(\\\\\\$([2-6]))~', '(?P<p\\2>\\d{1,2})', preg_quote(lang('$1-$3-$5')))) . '(.*))', $value, $match)) {
                        $return = ($match["p1"] != "" ? $match["p1"] : ($match["p2"] != "" ? ($match["p2"] < 70 ? 20 : 19) . $match["p2"] : gmdate("Y"))) . "-$match[p3]$match[p4]-$match[p5]$match[p6]" . end($match);
                }
-               $return = q($return);
-               if (!ereg('char|text', $field["type"]) && $field["full_type"] != "tinyint(1)" && $value == "") {
+               $return = ($field["type"] == "bit" && ereg('^[0-9]+$', $value) ? $return : q($return));
+               if (!ereg('char|text', $field["type"]) && !ereg("(tinyint|bit)\\(1\\)", $field["full_type"]) && $value == "") {
                        $return = "NULL";
                } elseif (ereg('^(md5|sha1)$', $function)) {
                        $return = "$function($return)";

diff --git a/todo.txt b/todo.txt
index cbca945f7583c8f49d69734a7a09a57424968105..656164b8f8bccc1a1a6f8aaaef7a488fa493f65b 100644 (file)
--- a/todo.txt
+++ b/todo.txt
@@ -23,7 +23,6 @@ Add whisperer to fields with foreign key to big table
 JS calendar for date fields
 
 MySQL:
-Saving of MySQL 5 BIT data type - don't use quote()
 Data longer than max_allowed_packet can be sent by mysqli_stmt_send_long_data()
 ? Geometry support