Display char type in <code>

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

diff --git a/functions.inc.php b/functions.inc.php
index cd95408a5f4c2b7ed6fef12bcaac8a77ccfafaa0..a3cc6e2b2aeca43c8103b03be8678c97e0957a92 100644 (file)
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -212,6 +212,7 @@ function select($result) {
                                $indexes = array();
                                $columns = array();
                                $blobs = array();
+                               $types = array();
                                for ($j=0; $j < count($row); $j++) {
                                        $field = $result->fetch_field();
                                        if (strlen($field->orgtable) && $field->flags & 2) {
@@ -234,6 +235,7 @@ function select($result) {
                                        if ($field->charsetnr == 63) {
                                                $blobs[$j] = true;
                                        }
+                                       $types[$j] = $field->type;
                                        echo "<th>" . htmlspecialchars($field->name) . "</th>";
                                }
                                echo "</tr></thead>\n";
@@ -247,6 +249,9 @@ function select($result) {
                                                $val = "<i>" . lang('%d byte(s)', strlen($val)) . "</i>";
                                        } else {
                                                $val = (strlen(trim($val)) ? nl2br(htmlspecialchars($val)) : "&nbsp;");
+                                               if ($types[$key] == 254) {
+                                                       $val = "<code>$val</code>";
+                                               }
                                        }
                                        if (isset($links[$key]) && !$columns[$links[$key]]) {
                                                $link = "edit=" . urlencode($links[$key]);

diff --git a/select.inc.php b/select.inc.php
index 87d87f5138b2501f5c12a566a66c7d7ed6e0e4ca..fbbe19f5068ef1625994bebddfcffca11b952062 100644 (file)
--- a/select.inc.php
+++ b/select.inc.php
@@ -147,6 +147,9 @@ for (var i=0; <?php echo $i; ?> > i; i++) {
                                        $val = '<a href="' . htmlspecialchars($SELF) . 'download=' . urlencode($_GET["select"]) . '&amp;field=' . urlencode($key) . $unique_idf . '">' . lang('%d byte(s)', strlen($val)) . '</a>';
                                } else {
                                        $val = (strlen(trim($val)) ? nl2br(htmlspecialchars($val)) : "&nbsp;");
+                                       if ($fields[$key]["type"] == "char") {
+                                               $val = "<code>$val</code>";
+                                       }
                                        foreach ((array) $foreign_keys[$key] as $foreign_key) {
                                                if (count($foreign_keys[$key]) == 1 || count($foreign_key["source"]) == 1) {
                                                        $val = '">' . "$val</a>";