beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Show select warnings

Browse source
This commit is contained in:
Jakub Vrana 2018-02-01 08:55:09 +01:00
parent 080fd0f374
commit ae2ea56681
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
adminer/include/adminer.inc.php
View file

@ -206,11 +206,23 @@ class Adminer {
* @return string
*/
function selectQuery($query, $time) {
global $jush;
return "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>($time)</span>"
global $jush, $driver;
$return = "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>($time)</span>"
. (support("sql") ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "")
. "</p>" // </p> - required for IE9 inline edit
;
$print = "</p>\n"; // required for IE9 inline edit
$warnings = $driver->warnings();
if ($warnings && $warnings->num_rows) {
$id = "warnings";
ob_start();
select($warnings); // select() usually needs to print a big table progressively
$return .= ", <a href='#$id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "")
. "$print<div id='$id' class='hidden'>\n" . ob_get_clean() . "</div>\n"
;
} else {
$return .= $print;
}
return $return;
}
/** Query printed in SQL command before execution

2
changes.txt
View file

@ -4,7 +4,7 @@ PHP <5.3 compatibility even with Elasticsearch enabled
Fully support functions in default values
Stop redirecting links via adminer.org
Support X-Forwarded-Prefix
MySQL: Display warnings in SQL command
MySQL: Display warnings in SQL command and select
MariaDB: Support JSON since MariaDB 10.2
PostgreSQL: Support functions
PostgreSQL: Allow editing views with uppercase letters (bug #467)