Select converted fields only once

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 81c387fce362e60aa16e9dd32b6d0a1f83d81c90..6539bc007458d857f3389ad5c002b8e9f60025c9 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -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);