Show select warnings
This commit is contained in:
parent
080fd0f374
commit
ae2ea56681
|
@ -206,11 +206,23 @@ class Adminer {
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function selectQuery($query, $time) {
|
function selectQuery($query, $time) {
|
||||||
global $jush;
|
global $jush, $driver;
|
||||||
return "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>($time)</span>"
|
$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>" : "")
|
. (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
|
/** Query printed in SQL command before execution
|
||||||
|
|
|
@ -4,7 +4,7 @@ PHP <5.3 compatibility even with Elasticsearch enabled
|
||||||
Fully support functions in default values
|
Fully support functions in default values
|
||||||
Stop redirecting links via adminer.org
|
Stop redirecting links via adminer.org
|
||||||
Support X-Forwarded-Prefix
|
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
|
MariaDB: Support JSON since MariaDB 10.2
|
||||||
PostgreSQL: Support functions
|
PostgreSQL: Support functions
|
||||||
PostgreSQL: Allow editing views with uppercase letters (bug #467)
|
PostgreSQL: Allow editing views with uppercase letters (bug #467)
|
||||||
|
|
Loading…
Reference in a new issue