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

fix logger for SQL commands

Browse source
This commit is contained in:
Mathieu Rochette 2015-03-11 17:52:11 +01:00 committed by Jakub Vrana
parent b8bea7fc56
commit 4cfe6263d9
4 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -197,6 +197,15 @@ focus(document.getElementById('username'));
;
}
/** Query printed in SQL command before execution
* @param string query to be executed
* @return string escaped query to be printed
*/
function sqlCommandQuery($query)
{
return shorten_utf8(trim($query), 1000);
}
/** Description of a row in a table
* @param string
* @return string SQL expression, empty string for no description

2
adminer/sql.inc.php
View file

@ -93,7 +93,7 @@ if (!$error && $_POST) {
$empty = false;
$q = substr($query, 0, $pos);
$commands++;
$print = "<pre id='sql-$commands'><code class='jush-$jush'>" . shorten_utf8(trim($q), 1000) . "</code></pre>\n";
$print = "<pre id='sql-$commands'><code class='jush-$jush'>" . $adminer->sqlCommandQuery($q) . "</code></pre>\n";
if ($jush == "sqlite" && preg_match("~^$space*+ATTACH\\b~i", $q, $match)) {
// PHP doesn't support setting SQLITE_LIMIT_ATTACHED
echo $print;

5
plugins/plugin.php
View file

@ -177,6 +177,11 @@ class AdminerPlugin extends Adminer {
return $this->_applyPlugin(__FUNCTION__, $args);
}
function sqlCommandQuery($query) {
$args = func_get_args();
return $this->_applyPlugin(__FUNCTION__, $args);
}
function rowDescription($table) {
$args = func_get_args();
return $this->_applyPlugin(__FUNCTION__, $args);

8
plugins/sql-log.php
View file

@ -18,6 +18,14 @@ class AdminerSqlLog {
}
function messageQuery($query, $time) {
$this->_log($query);
}
function sqlCommandQuery($query) {
$this->_log($query);
}
function _log($query) {
if ($this->filename == "") {
$adminer = adminer();
$this->filename = $adminer->database() . ".sql"; // no database goes to ".sql" to avoid collisions