Permalink
Browse files

Better support for bit data type

  • Loading branch information...
1 parent d663eed commit 24fac38d26820814ced7ff528c5eb64c9c077b07 @vrana committed Feb 10, 2011
Showing with 7 additions and 8 deletions.
  1. +1 −1 adminer/include/adminer.inc.php
  2. +6 −6 editor/include/adminer.inc.php
  3. +0 −1 todo.txt
@@ -459,7 +459,7 @@ function editInput($table, $field, $attrs, $value) {
*/
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)) {
@@ -164,13 +164,13 @@ function selectVal($val, $link, $field) {
$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 @@ function editFunctions($field) {
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 @@ function editInput($table, $field, $attrs, $value) {
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 @@ function processInput($field, $value, $function = "") {
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)";
View
@@ -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

0 comments on commit 24fac38

Please sign in to comment.