Display original column name in select
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1342 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
parent
b667bfbe2d
commit
7da9cce10d
|
@ -20,29 +20,31 @@ function select($result, $connection2 = null) {
|
||||||
echo "<thead><tr>";
|
echo "<thead><tr>";
|
||||||
for ($j=0; $j < count($row); $j++) {
|
for ($j=0; $j < count($row); $j++) {
|
||||||
$field = $result->fetch_field();
|
$field = $result->fetch_field();
|
||||||
if ($field->orgtable != "") {
|
$orgtable = $field->orgtable;
|
||||||
if (!isset($indexes[$field->orgtable])) {
|
$orgname = $field->orgname;
|
||||||
|
if ($orgtable != "") {
|
||||||
|
if (!isset($indexes[$orgtable])) {
|
||||||
// find primary key in each table
|
// find primary key in each table
|
||||||
$indexes[$field->orgtable] = array();
|
$indexes[$orgtable] = array();
|
||||||
foreach (indexes($field->orgtable, $connection2) as $index) {
|
foreach (indexes($orgtable, $connection2) as $index) {
|
||||||
if ($index["type"] == "PRIMARY") {
|
if ($index["type"] == "PRIMARY") {
|
||||||
$indexes[$field->orgtable] = array_flip($index["columns"]);
|
$indexes[$orgtable] = array_flip($index["columns"]);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$columns[$field->orgtable] = $indexes[$field->orgtable];
|
$columns[$orgtable] = $indexes[$orgtable];
|
||||||
}
|
}
|
||||||
if (isset($columns[$field->orgtable][$field->orgname])) {
|
if (isset($columns[$orgtable][$orgname])) {
|
||||||
unset($columns[$field->orgtable][$field->orgname]);
|
unset($columns[$orgtable][$orgname]);
|
||||||
$indexes[$field->orgtable][$field->orgname] = $j;
|
$indexes[$orgtable][$orgname] = $j;
|
||||||
$links[$j] = $field->orgtable;
|
$links[$j] = $orgtable;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($field->charsetnr == 63) {
|
if ($field->charsetnr == 63) {
|
||||||
$blobs[$j] = true;
|
$blobs[$j] = true;
|
||||||
}
|
}
|
||||||
$types[$j] = $field->type;
|
$types[$j] = $field->type;
|
||||||
echo "<th>" . h($field->name);
|
echo "<th" . ($orgtable != "" || $field->name != $orgname ? " title='" . h(($orgtable != "" ? "$orgtable." : "") . $orgname) . "'" : "") . ">" . h($field->name);
|
||||||
}
|
}
|
||||||
echo "</thead>\n";
|
echo "</thead>\n";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue