Display type in schema

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@724 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/mysql.inc.php b/adminer/include/mysql.inc.php
index 7b9fbb1f55c7cf46a8b55e3858b9f6473cab8a37..993de9597c0fb7deab154d59e895d696d3dd4891 100644 (file)
--- a/adminer/include/mysql.inc.php
+++ b/adminer/include/mysql.inc.php
@@ -230,6 +230,7 @@ function fields($table) {
                        preg_match('~^([^( ]+)(?:\\((.+)\\))?( unsigned)?( zerofill)?$~', $row["Type"], $match);
                        $return[$row["Field"]] = array(
                                "field" => $row["Field"],
+                               "Type" => $row["Type"],
                                "type" => $match[1],
                                "length" => $match[2],
                                "unsigned" => ltrim($match[3] . $match[4]),

diff --git a/adminer/schema.inc.php b/adminer/schema.inc.php
index 0d78224e83529411512760fdd63a847d315200d3..2728ae99a9681f9e98a405290b798752cd4cd056 100644 (file)
--- a/adminer/schema.inc.php
+++ b/adminer/schema.inc.php
@@ -63,14 +63,17 @@ foreach ($schema as $name => $table) {
        echo '<a href="' . htmlspecialchars($SELF) . 'table=' . urlencode($name) . '"><strong>' . htmlspecialchars($name) . "</strong></a><br />\n";
        foreach ($table["fields"] as $field) {
                $val = htmlspecialchars($field["field"]);
+               $title = ' title="' . htmlspecialchars($field["Type"] . ($field["null"] ? " " . lang('NULL') : '')) . '"';
                if (preg_match('~char|text~', $field["type"])) {
-                       $val = "<span class='char'>$val</span>";
+                       $val = "<span class='char'$title>$val</span>";
                } elseif (preg_match('~date|time|year~', $field["type"])) {
-                       $val = "<span class='date'>$val</span>";
+                       $val = "<span class='date'$title>$val</span>";
                } elseif (preg_match('~binary|blob~', $field["type"])) {
-                       $val = "<span class='binary'>$val</span>";
+                       $val = "<span class='binary'$title>$val</span>";
                } elseif (preg_match('~enum|set~', $field["type"])) {
-                       $val = "<span class='enum'>$val</span>";
+                       $val = "<span class='enum'$title>$val</span>";
+               } else {
+                       $val = "<span$title>$val</span>";
                }
                echo ($field["primary"] ? "<em>$val</em>" : $val) . "<br />\n";
        }