1
0
mirror of https://github.com/vrana/adminer.git synced 2025-08-16 19:44:00 +02:00

Don't modify $query by adminer_select_query

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@801 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana
2009-07-11 19:52:48 +00:00
parent c16c57b1b1
commit c74c06ad49
3 changed files with 5 additions and 28 deletions

View File

@@ -25,29 +25,11 @@ function adminer_select_links($table_status) {
}
function adminer_select_query($query) {
$join = "";
$i = 1;
foreach (foreign_keys($_GET["select"]) as $foreign_key) {
$on = array();
foreach ($foreign_key["source"] as $key => $val) {
$on[] = "`t0`." . idf_escape($val) . " = `t$i`." . idf_escape($foreign_key["target"][$key]);
}
//~ $join .= "\nLEFT JOIN " . idf_escape($foreign_key["table"]) . " AS `t$i` ON " . implode(" AND ", $on);
//! use in select
$i++;
}
$query = preg_replace("~((?:[^'`]*|'(?:[^'\\\\]*|\\\\.)+')+)(`((?:[^`]+|``)*)`)~", '\\1`t0`.\\2', $query); // don't match ` inside ''
$query = preg_replace('~ FROM `t0`.(`((?:[^`]+|``)*)`) ?~', "\nFROM \\1 AS `t0`" . addcslashes($join, '\\$') . "\n", $query);
$return = call_adminer('select_query', "", $query);
if (!$return) {
echo "<!-- " . str_replace("--", " --><!-- ", $query) . " -->\n";
return $query;
}
return $return;
return call_adminer('select_query', "<!-- " . str_replace("--", "--><!--", $query) . " -->\n", $query);
}
function adminer_message_query($query) {
return call_adminer('message_query', "<!-- " . str_replace("--", " --><!-- ", $query) . " -->", $query);
return call_adminer('message_query', "<!-- " . str_replace("--", "--><!--", $query) . " -->", $query);
}
function adminer_navigation($missing) {