Show table links if driver supports indexes

diff --git a/adminer/db.inc.php b/adminer/db.inc.php
index 1cb76ebddeec2e79c510023a96124fff5ece74ab..401371c0802454c56c3a91c8adea83f31a124cfc 100644 (file)
--- a/adminer/db.inc.php
+++ b/adminer/db.inc.php
@@ -80,7 +80,7 @@ if ($adminer->homepage()) {
                        foreach ($tables_list as $name => $type) {
                                $view = ($type !== null && !preg_match('~table~i', $type));
                                echo '<tr' . odd() . '><td>' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array($name, $tables_views, true), "", "formUncheck('check-all');");
-                               echo '<th>' . (support("table") ? '<a href="' . h(ME) . 'table=' . urlencode($name) . '" title="' . lang('Show structure') . '">' . h($name) . '</a>' : h($name));
+                               echo '<th>' . (support("table") || support("indexes") ? '<a href="' . h(ME) . 'table=' . urlencode($name) . '" title="' . lang('Show structure') . '">' . h($name) . '</a>' : h($name));
                                if ($view) {
                                        echo '<td colspan="6"><a href="' . h(ME) . "view=" . urlencode($name) . '" title="' . lang('Alter view') . '">' . lang('View') . '</a>';
                                        echo '<td align="right"><a href="' . h(ME) . "select=" . urlencode($name) . '" title="' . lang('Select data') . '">?</a>';
@@ -95,7 +95,7 @@ if ($adminer->homepage()) {
                                                "Rows" => array("select", lang('Select data')),
                                        ) as $key => $link) {
                                                $id = " id='$key-" . h($name) . "'";
-                                               echo ($link ? "<td align='right'>" . (support("table") || $key == "Rows"
+                                               echo ($link ? "<td align='right'>" . (support("table") || $key == "Rows" || (support("indexes") && $key != "Data_length")
                                                        ? "<a href='" . h(ME . "$link[0]=") . urlencode($name) . "'$id title='$link[1]'>?</a>"
                                                        : "<span$id>?</span>"
                                                ) : "<td id='$key-" . h($name) . "'>&nbsp;");

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 729c71484d6a9e04dfacf5f0c0abefe6835b0310..d2bbd1183e7741c712dfeb183aba6ea40b82b9b0 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -128,8 +128,10 @@ username.form['auth[driver]'].onchange();
        function selectLinks($tableStatus, $set = "") {
                echo '<p class="links">';
                $links = array("select" => lang('Select data'));
-               if (support("table")) {
+               if (support("table") || support("indexes")) {
                        $links["table"] = lang('Show structure');
+               }
+               if (support("table")) {
                        if (is_view($tableStatus)) {
                                $links["view"] = lang('Alter view');
                        } else {
@@ -854,7 +856,7 @@ username.form['auth[driver]'].onchange();
                foreach ($tables as $table => $status) {
                        echo '<a href="' . h(ME) . 'select=' . urlencode($table) . '"' . bold($_GET["select"] == $table || $_GET["edit"] == $table) . ">" . lang('select') . "</a> ";
                        $name = $this->tableName($status);
-                       echo (support("table")
+                       echo (support("table") || support("indexes")
                                ? '<a href="' . h(ME) . 'table=' . urlencode($table) . '"' . bold(in_array($table, array($_GET["table"], $_GET["create"], $_GET["indexes"], $_GET["foreign"], $_GET["trigger"])), (is_view($status) ? "view" : "")) . " title='" . lang('Show structure') . "'>$name</a>"
                                : "<span>$name</span>"
                        ) . "<br>\n";

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 0d81884c642c3d6b99141c2b85330f5aa2c44a0c..1a070e1ad97aab77054354bc1e9eb83d61d82f74 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -448,7 +448,7 @@ if (!$columns && support("table")) {
                                        ? $page + (count($rows) >= $limit ? 2 : 1)
                                        : floor(($found_rows - 1) / $limit)
                                );
-                               if (support("table")) {
+                               if ($jush != "simpledb") {
                                        echo '<a href="' . h(remove_from_uri("page")) . "\" onclick=\"pageClick(this.href, +prompt('" . lang('Page') . "', '" . ($page + 1) . "'), event); return false;\">" . lang('Page') . "</a>:";
                                        echo pagination(0, $page) . ($page > 5 ? " ..." : "");
                                        for ($i = max(1, $page - 4); $i < min($max_page, $page + 5); $i++) {

diff --git a/adminer/table.inc.php b/adminer/table.inc.php
index a8bab598a42537706e220c1b980eff27d90be410..aa12583cef61b74d16fd2ecb0ec8374a901ef577 100644 (file)
--- a/adminer/table.inc.php
+++ b/adminer/table.inc.php
@@ -25,64 +25,63 @@ if ($fields) {
                echo "\n";
        }
        echo "</table>\n";
-       
-       if (!is_view($table_status)) {
-               if (support("indexes")) {
-                       echo "<h3 id='indexes'>" . lang('Indexes') . "</h3>\n";
-                       $indexes = indexes($TABLE);
-                       if ($indexes) {
-                               echo "<table cellspacing='0'>\n";
-                               foreach ($indexes as $name => $index) {
-                                       ksort($index["columns"]); // enforce correct columns order
-                                       $print = array();
-                                       foreach ($index["columns"] as $key => $val) {
-                                               $print[] = "<i>" . h($val) . "</i>"
-                                                       . ($index["lengths"][$key] ? "(" . $index["lengths"][$key] . ")" : "")
-                                                       . ($index["descs"][$key] ? " DESC" : "")
-                                               ;
-                                       }
-                                       echo "<tr title='" . h($name) . "'><th>$index[type]<td>" . implode(", ", $print) . "\n";
-                               }
-                               echo "</table>\n";
-                       }
-                       echo '<p class="links"><a href="' . h(ME) . 'indexes=' . urlencode($TABLE) . '">' . lang('Alter indexes') . "</a>\n";
-               }
-               
-               if (fk_support($table_status)) {
-                       echo "<h3 id='foreign-keys'>" . lang('Foreign keys') . "</h3>\n";
-                       $foreign_keys = foreign_keys($TABLE);
-                       if ($foreign_keys) {
-                               echo "<table cellspacing='0'>\n";
-                               echo "<thead><tr><th>" . lang('Source') . "<td>" . lang('Target') . "<td>" . lang('ON DELETE') . "<td>" . lang('ON UPDATE') . "<td>&nbsp;</thead>\n";
-                               foreach ($foreign_keys as $name => $foreign_key) {
-                                       echo "<tr title='" . h($name) . "'>";
-                                       echo "<th><i>" . implode("</i>, <i>", array_map('h', $foreign_key["source"])) . "</i>";
-                                       echo "<td><a href='" . h($foreign_key["db"] != "" ? preg_replace('~db=[^&]*~', "db=" . urlencode($foreign_key["db"]), ME) : ($foreign_key["ns"] != "" ? preg_replace('~ns=[^&]*~', "ns=" . urlencode($foreign_key["ns"]), ME) : ME)) . "table=" . urlencode($foreign_key["table"]) . "'>"
-                                               . ($foreign_key["db"] != "" ? "<b>" . h($foreign_key["db"]) . "</b>." : "") . ($foreign_key["ns"] != "" ? "<b>" . h($foreign_key["ns"]) . "</b>." : "") . h($foreign_key["table"])
-                                               . "</a>"
+}
+
+if (!is_view($table_status)) {
+       if (support("indexes")) {
+               echo "<h3 id='indexes'>" . lang('Indexes') . "</h3>\n";
+               $indexes = indexes($TABLE);
+               if ($indexes) {
+                       echo "<table cellspacing='0'>\n";
+                       foreach ($indexes as $name => $index) {
+                               ksort($index["columns"]); // enforce correct columns order
+                               $print = array();
+                               foreach ($index["columns"] as $key => $val) {
+                                       $print[] = "<i>" . h($val) . "</i>"
+                                               . ($index["lengths"][$key] ? "(" . $index["lengths"][$key] . ")" : "")
+                                               . ($index["descs"][$key] ? " DESC" : "")
                                        ;
-                                       echo "(<i>" . implode("</i>, <i>", array_map('h', $foreign_key["target"])) . "</i>)";
-                                       echo "<td>" . nbsp($foreign_key["on_delete"]) . "\n";
-                                       echo "<td>" . nbsp($foreign_key["on_update"]) . "\n";
-                                       echo '<td><a href="' . h(ME . 'foreign=' . urlencode($TABLE) . '&name=' . urlencode($name)) . '">' . lang('Alter') . '</a>';
                                }
-                               echo "</table>\n";
+                               echo "<tr title='" . h($name) . "'><th>$index[type]<td>" . implode(", ", $print) . "\n";
                        }
-                       echo '<p class="links"><a href="' . h(ME) . 'foreign=' . urlencode($TABLE) . '">' . lang('Add foreign key') . "</a>\n";
+                       echo "</table>\n";
                }
-               
+               echo '<p class="links"><a href="' . h(ME) . 'indexes=' . urlencode($TABLE) . '">' . lang('Alter indexes') . "</a>\n";
        }
        
-       if (support(is_view($table_status) ? "view_trigger" : "trigger")) {
-               echo "<h3 id='triggers'>" . lang('Triggers') . "</h3>\n";
-               $triggers = triggers($TABLE);
-               if ($triggers) {
+       if (fk_support($table_status)) {
+               echo "<h3 id='foreign-keys'>" . lang('Foreign keys') . "</h3>\n";
+               $foreign_keys = foreign_keys($TABLE);
+               if ($foreign_keys) {
                        echo "<table cellspacing='0'>\n";
-                       foreach ($triggers as $key => $val) {
-                               echo "<tr valign='top'><td>$val[0]<td>$val[1]<th>" . h($key) . "<td><a href='" . h(ME . 'trigger=' . urlencode($TABLE) . '&name=' . urlencode($key)) . "'>" . lang('Alter') . "</a>\n";
+                       echo "<thead><tr><th>" . lang('Source') . "<td>" . lang('Target') . "<td>" . lang('ON DELETE') . "<td>" . lang('ON UPDATE') . "<td>&nbsp;</thead>\n";
+                       foreach ($foreign_keys as $name => $foreign_key) {
+                               echo "<tr title='" . h($name) . "'>";
+                               echo "<th><i>" . implode("</i>, <i>", array_map('h', $foreign_key["source"])) . "</i>";
+                               echo "<td><a href='" . h($foreign_key["db"] != "" ? preg_replace('~db=[^&]*~', "db=" . urlencode($foreign_key["db"]), ME) : ($foreign_key["ns"] != "" ? preg_replace('~ns=[^&]*~', "ns=" . urlencode($foreign_key["ns"]), ME) : ME)) . "table=" . urlencode($foreign_key["table"]) . "'>"
+                                       . ($foreign_key["db"] != "" ? "<b>" . h($foreign_key["db"]) . "</b>." : "") . ($foreign_key["ns"] != "" ? "<b>" . h($foreign_key["ns"]) . "</b>." : "") . h($foreign_key["table"])
+                                       . "</a>"
+                               ;
+                               echo "(<i>" . implode("</i>, <i>", array_map('h', $foreign_key["target"])) . "</i>)";
+                               echo "<td>" . nbsp($foreign_key["on_delete"]) . "\n";
+                               echo "<td>" . nbsp($foreign_key["on_update"]) . "\n";
+                               echo '<td><a href="' . h(ME . 'foreign=' . urlencode($TABLE) . '&name=' . urlencode($name)) . '">' . lang('Alter') . '</a>';
                        }
                        echo "</table>\n";
                }
-               echo '<p class="links"><a href="' . h(ME) . 'trigger=' . urlencode($TABLE) . '">' . lang('Add trigger') . "</a>\n";
+               echo '<p class="links"><a href="' . h(ME) . 'foreign=' . urlencode($TABLE) . '">' . lang('Add foreign key') . "</a>\n";
+       }
+}
+
+if (support(is_view($table_status) ? "view_trigger" : "trigger")) {
+       echo "<h3 id='triggers'>" . lang('Triggers') . "</h3>\n";
+       $triggers = triggers($TABLE);
+       if ($triggers) {
+               echo "<table cellspacing='0'>\n";
+               foreach ($triggers as $key => $val) {
+                       echo "<tr valign='top'><td>$val[0]<td>$val[1]<th>" . h($key) . "<td><a href='" . h(ME . 'trigger=' . urlencode($TABLE) . '&name=' . urlencode($key)) . "'>" . lang('Alter') . "</a>\n";
+               }
+               echo "</table>\n";
        }
+       echo '<p class="links"><a href="' . h(ME) . 'trigger=' . urlencode($TABLE) . '">' . lang('Add trigger') . "</a>\n";
 }