Simplify storing executed SQL queries to bookmarks

This commit is contained in:
Jakub Vrana 2018-10-01 17:08:58 +02:00
parent 01e08cc053
commit ae03bdd4c4
4 changed files with 22 additions and 1 deletions

View file

@ -219,7 +219,7 @@ if (!isset($_GET["import"])) {
}
echo "<p>";
textarea("query", $q, 20);
echo ($_POST ? "" : script("qs('textarea').focus();"));
echo script(($_POST ? "" : "qs('textarea').focus();\n") . "qs('#form').onsubmit = partial(sqlSubmit, qs('#form'), '" . remove_from_uri("sql|limit|error_stops|only_errors") . "');");
echo "<p>$execute\n";
echo lang('Limit rows') . ": <input type='number' name='limit' class='size' value='" . h($_POST ? $_POST["limit"] : $_GET["limit"]) . "'>\n";

View file

@ -595,6 +595,23 @@ function indexesAddColumn(prefix) {
/** Updates the form action
* @param HTMLFormElement
* @param string
*/
function sqlSubmit(form, root) {
if (encodeURIComponent(form['query'].value).length < 2e3) {
form.action = root
+ '&sql=' + encodeURIComponent(form['query'].value)
+ (form['limit'].value ? '&limit=' + +form['limit'].value : '')
+ (form['error_stops'].checked ? '&error_stops=1' : '')
+ (form['only_errors'].checked ? '&only_errors=1' : '')
;
}
}
/** Handle changing trigger time or event
* @param RegExp
* @param string

View file

@ -491,6 +491,9 @@ function bodyKeydown(event, button) {
if (button) {
target.form[button].click();
} else {
if (target.form.onsubmit) {
target.form.onsubmit();
}
target.form.submit();
}
target.focus();

View file

@ -1,4 +1,5 @@
Adminer 4.7.0-dev:
Simplify storing executed SQL queries to bookmarks
Warn when using password with leading or trailing spaces
Fix inline editing of empty cells (regression from 4.6.3)
Allow adding more than two indexes and forign key columns at a time (regression from 4.4.0)