mirror of
https://github.com/vrana/adminer.git
synced 2025-08-08 15:47:00 +02:00
Select converted fields only once
This commit is contained in:
@@ -260,13 +260,19 @@ if (!$columns && support("table")) {
|
||||
$select2 = $select;
|
||||
if (!$select2) {
|
||||
$select2[] = "*";
|
||||
$convert_fields = convert_fields($columns, $fields, $select);
|
||||
if ($convert_fields) {
|
||||
$select2[] = substr($convert_fields, 2);
|
||||
}
|
||||
if ($oid) {
|
||||
$select2[] = $oid;
|
||||
}
|
||||
}
|
||||
$convert_fields = convert_fields($columns, $fields, $select);
|
||||
if ($convert_fields) {
|
||||
$select2[] = substr($convert_fields, 2);
|
||||
foreach ($select as $key => $val) {
|
||||
$field = $fields[idf_unescape($val)];
|
||||
if ($field && ($as = convert_field($field))) {
|
||||
$select2[$key] = "$as AS $val";
|
||||
}
|
||||
}
|
||||
$result = $driver->select($TABLE, $select2, $where, $group, $order, $limit, $page, true);
|
||||
|
||||
|
Reference in New Issue
Block a user