Print run time next to executed queries
This commit is contained in:
parent
3bc5c17d03
commit
01a2722c94
|
@ -135,7 +135,7 @@ function textarea($name, $value, $rows = 10, $cols = 80) {
|
||||||
* @return string HTML code
|
* @return string HTML code
|
||||||
*/
|
*/
|
||||||
function format_time($start, $end) {
|
function format_time($start, $end) {
|
||||||
return " <span class='time'>(" . lang('%.3f s', max(0, array_sum(explode(" ", $end)) - array_sum(explode(" ", $start)))) . ")</span>";
|
return lang('%.3f s', max(0, array_sum(explode(" ", $end)) - array_sum(explode(" ", $start))));
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Print table columns for type edit
|
/** Print table columns for type edit
|
||||||
|
|
|
@ -482,12 +482,15 @@ function redirect($location, $message = null) {
|
||||||
*/
|
*/
|
||||||
function query_redirect($query, $location, $message, $redirect = true, $execute = true, $failed = false) {
|
function query_redirect($query, $location, $message, $redirect = true, $execute = true, $failed = false) {
|
||||||
global $connection, $error, $adminer;
|
global $connection, $error, $adminer;
|
||||||
|
$time = "";
|
||||||
if ($execute) {
|
if ($execute) {
|
||||||
|
$start = microtime();
|
||||||
$failed = !$connection->query($query);
|
$failed = !$connection->query($query);
|
||||||
|
$time = "; -- " . format_time($start, microtime());
|
||||||
}
|
}
|
||||||
$sql = "";
|
$sql = "";
|
||||||
if ($query) {
|
if ($query) {
|
||||||
$sql = $adminer->messageQuery("$query;");
|
$sql = $adminer->messageQuery($query . $time);
|
||||||
}
|
}
|
||||||
if ($failed) {
|
if ($failed) {
|
||||||
$error = error() . $sql;
|
$error = error() . $sql;
|
||||||
|
@ -508,10 +511,13 @@ function queries($query = null) {
|
||||||
static $queries = array();
|
static $queries = array();
|
||||||
if ($query === null) {
|
if ($query === null) {
|
||||||
// return executed queries without parameter
|
// return executed queries without parameter
|
||||||
return implode(";\n", $queries);
|
return implode("\n", $queries);
|
||||||
}
|
}
|
||||||
$queries[] = (ereg(';$', $query) ? "DELIMITER ;;\n$query;\nDELIMITER " : $query);
|
$start = microtime();
|
||||||
return $connection->query($query);
|
$return = $connection->query($query);
|
||||||
|
$queries[] = (ereg(';$', $query) ? "DELIMITER ;;\n$query;\nDELIMITER " : $query)
|
||||||
|
. "; -- " . format_time($start, microtime());
|
||||||
|
return $return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Apply command to all array items
|
/** Apply command to all array items
|
||||||
|
|
|
@ -101,7 +101,8 @@ if (!$error && $_POST) {
|
||||||
do {
|
do {
|
||||||
$result = $connection->store_result();
|
$result = $connection->store_result();
|
||||||
$end = microtime();
|
$end = microtime();
|
||||||
$time = format_time($start, $end) . (strlen($q) < 1000 ? " <a href='" . h(ME) . "sql=" . urlencode(trim($q)) . "'>" . lang('Edit') . "</a>" : ""); // 1000 - maximum length of encoded URL in IE is 2083 characters
|
$time = " <span class='time'>(" . format_time($start, $end) . ")</span>"
|
||||||
|
. (strlen($q) < 1000 ? " <a href='" . h(ME) . "sql=" . urlencode(trim($q)) . "'>" . lang('Edit') . "</a>" : ""); // 1000 - maximum length of encoded URL in IE is 2083 characters
|
||||||
if ($connection->error) {
|
if ($connection->error) {
|
||||||
echo ($_POST["only_errors"] ? $print : "");
|
echo ($_POST["only_errors"] ? $print : "");
|
||||||
echo "<p class='error'>" . lang('Error in query') . ($connection->errno ? " ($connection->errno)" : "") . ": " . error() . "\n";
|
echo "<p class='error'>" . lang('Error in query') . ($connection->errno ? " ($connection->errno)" : "") . ": " . error() . "\n";
|
||||||
|
@ -154,7 +155,8 @@ if (!$error && $_POST) {
|
||||||
if ($empty) {
|
if ($empty) {
|
||||||
echo "<p class='message'>" . lang('No commands to execute.') . "\n";
|
echo "<p class='message'>" . lang('No commands to execute.') . "\n";
|
||||||
} elseif ($_POST["only_errors"]) {
|
} elseif ($_POST["only_errors"]) {
|
||||||
echo "<p class='message'>" . lang('%d query(s) executed OK.', $commands - count($errors)) . format_time($total_start, microtime()) . "\n";
|
echo "<p class='message'>" . lang('%d query(s) executed OK.', $commands - count($errors));
|
||||||
|
echo " <span class='time'>(" . format_time($total_start, microtime()) . ")</span>\n";
|
||||||
} elseif ($errors && $commands > 1) {
|
} elseif ($errors && $commands > 1) {
|
||||||
echo "<p class='error'>" . lang('Error in query') . ": " . implode("", $errors) . "\n";
|
echo "<p class='error'>" . lang('Error in query') . ": " . implode("", $errors) . "\n";
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
Adminer 3.6.5-dev:
|
Adminer 3.6.5-dev:
|
||||||
|
Print run time next to executed queries
|
||||||
|
|
||||||
Adminer 3.6.4 (released 2013-04-26):
|
Adminer 3.6.4 (released 2013-04-26):
|
||||||
Display pagination on a fixed position
|
Display pagination on a fixed position
|
||||||
|
|
Loading…
Reference in a new issue