mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-12 17:44:07 +02:00
Code Issues Releases Wiki Activity

Move explain below warnings

Browse Source
This commit is contained in:
Jakub Vrana
2018-01-31 20:25:11 +01:00
parent 40038d4210
commit 7ad09d2cb4
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
adminer/sql.inc.php
View File

@@ -135,6 +135,8 @@ if (!$error && $_POST) {
if ($warnings && $warnings->num_rows) { if ($warnings && $warnings->num_rows) {
$time .= ", <a href='#$warnings_id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$warnings_id');", ""); $time .= ", <a href='#$warnings_id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$warnings_id');", "");
} }
$explain = null;
$explain_id = "explain-$commands";
if (is_object($result)) { if (is_object($result)) {
$limit = $_POST["limit"]; $limit = $_POST["limit"];
$orgtables = select($result, $connection2, array(), $limit); $orgtables = select($result, $connection2, array(), $limit);
@@ -143,23 +145,17 @@ if (!$error && $_POST) {
$num_rows = $result->num_rows; $num_rows = $result->num_rows;
echo "<p>" . ($num_rows ? ($limit && $num_rows > $limit ? lang('%d / ', $limit) : "") . lang('%d row(s)', $num_rows) : ""); echo "<p>" . ($num_rows ? ($limit && $num_rows > $limit ? lang('%d / ', $limit) : "") . lang('%d row(s)', $num_rows) : "");
echo $time; echo $time;
if ($connection2 && preg_match("~^($space|\\()*+SELECT\\b~i", $q) && ($explain = explain($connection2, $q))) {
echo ", <a href='#$explain_id'>EXPLAIN</a>" . script("qsl('a').onclick = partial(toggle, '$explain_id');", "");
}
$id = "export-$commands"; $id = "export-$commands";
$export = ", <a href='#$id'>" . lang('Export') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "") . "<span id='$id' class='hidden'>: " echo ", <a href='#$id'>" . lang('Export') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "") . "<span id='$id' class='hidden'>: "
. html_select("output", $adminer->dumpOutput(), $adminer_export["output"]) . " " . html_select("output", $adminer->dumpOutput(), $adminer_export["output"]) . " "
. html_select("format", $dump_format, $adminer_export["format"]) . html_select("format", $dump_format, $adminer_export["format"])
. "<input type='hidden' name='query' value='" . h($q) . "'>" . "<input type='hidden' name='query' value='" . h($q) . "'>"
. " <input type='submit' name='export' value='" . lang('Export') . "'><input type='hidden' name='token' value='$token'></span>\n" . " <input type='submit' name='export' value='" . lang('Export') . "'><input type='hidden' name='token' value='$token'></span>\n"
. "</form>\n"
; ;
if ($connection2 && preg_match("~^($space|\\()*+SELECT\\b~i", $q) && ($explain = explain($connection2, $q))) {
$id = "explain-$commands";
echo ", <a href='#$id'>EXPLAIN</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "") . $export;
echo "<div id='$id' class='hidden'>\n";
select($explain, $connection2, $orgtables);
echo "</div>\n";
} else {
echo $export;
}
echo "</form>\n";
} }
} else { } else {
@@ -172,11 +168,16 @@ if (!$error && $_POST) {
echo "<p class='message' title='" . h($connection->info) . "'>" . lang('Query executed OK, %d row(s) affected.', $connection->affected_rows) . "$time\n"; echo "<p class='message' title='" . h($connection->info) . "'>" . lang('Query executed OK, %d row(s) affected.', $connection->affected_rows) . "$time\n";
} }
} }
if ($warnings && $warnings->num_rows && (!$_POST["only_errors"] || is_object($result))) { if ($warnings && $warnings->num_rows && !$_POST["only_errors"]) {
echo "<div id='$warnings_id' class='hidden'>\n"; echo "<div id='$warnings_id' class='hidden'>\n";
select($warnings); select($warnings);
echo "</div>\n"; echo "</div>\n";
} }
if ($explain) {
echo "<div id='$explain_id' class='hidden'>\n";
select($explain, $connection2, $orgtables);
echo "</div>\n";
}
} }
$start = microtime(true); $start = microtime(true);