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

Display ; in history (thanks to Jan Cerny)

Browse source
This commit is contained in:
Jakub Vrana 2011-03-22 15:34:34 +01:00
parent 0bc930c52a
commit 2e6ad2037f
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adminer/include/editing.inc.php
View file

@ -109,7 +109,7 @@ function textarea($name, $value, $rows = 10, $cols = 80) {
echo "<textarea name='$name' rows='$rows' cols='$cols' class='sqlarea' spellcheck='false' wrap='off' onkeydown='return textareaKeydown(this, event);'>"; // spellcheck, wrap - not valid before HTML5 echo "<textarea name='$name' rows='$rows' cols='$cols' class='sqlarea' spellcheck='false' wrap='off' onkeydown='return textareaKeydown(this, event);'>"; // spellcheck, wrap - not valid before HTML5
if (is_array($value)) { if (is_array($value)) {
foreach ($value as $val) { // not implode() to save memory foreach ($value as $val) { // not implode() to save memory
echo h($val) . ";\n\n\n"; // rtrim(, ';') would possibly damage DELIMITER echo h($val) . "\n\n\n";
} }
} else { } else {
echo h($value); echo h($value);

6
adminer/include/functions.inc.php
View file

@ -413,7 +413,7 @@ function query_redirect($query, $location, $message, $redirect = true, $execute
} }
$sql = ""; $sql = "";
if ($query) { if ($query) {
$sql = $adminer->messageQuery($query); $sql = $adminer->messageQuery("$query;");
} }
if ($failed) { if ($failed) {
$error = error() . $sql; $error = error() . $sql;
@ -434,9 +434,9 @@ function queries($query = null) {
static $queries = array(); static $queries = array();
if (!isset($query)) { if (!isset($query)) {
// 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;"); $queries[] = (ereg(';$', $query) ? "DELIMITER ;;\n$query;\nDELIMITER " : $query);
return $connection->query($query); return $connection->query($query);
} }

7
adminer/sql.inc.php
View file

@ -32,8 +32,11 @@ if (!$error && $_POST) {
if (function_exists('memory_get_usage')) { if (function_exists('memory_get_usage')) {
@ini_set("memory_limit", 2 * strlen($query) + memory_get_usage() + 8e6); // @ - may be disabled, 2 - substr and trim, 8e6 - other variables @ini_set("memory_limit", 2 * strlen($query) + memory_get_usage() + 8e6); // @ - may be disabled, 2 - substr and trim, 8e6 - other variables
} }
if ($query != "" && strlen($query) < 1e6 && (!$history || end($history) != $query)) { // don't add repeated and big queries if ($query != "" && strlen($query) < 1e6) { // don't add big queries
$history[] = $query; $q = $query . (ereg(';$', $query) ? "" : ";"); //! doesn't work with DELIMITER |
if (!$history || end($history) != $q) { // no repeated queries
$history[] = $q;
}
} }
$space = "(\\s|/\\*.*\\*/|(#|-- )[^\n]*\n|--\n)"; $space = "(\\s|/\\*.*\\*/|(#|-- )[^\n]*\n|--\n)";
if (!ini_bool("session.use_cookies")) { if (!ini_bool("session.use_cookies")) {

1
changes.txt
View file

@ -12,6 +12,7 @@ Show databases even with skip_show_database in MySQL 5 (thanks to Radoslaw Kowal
Set MySQL time zone by PHP setting Set MySQL time zone by PHP setting
Disable maxlength with functions in edit Disable maxlength with functions in edit
Better placement of AJAX icon Better placement of AJAX icon
Display ; in history (thanks to Jan Cerny)
Table header in CSV export (Editor) Table header in CSV export (Editor)
Time format hint (Editor) Time format hint (Editor)
Respect order after search (Editor) Respect order after search (Editor)