Merge pull request #18678 from kamil-tekiela/Optimize-autocomplete

MauricioFauth · web-flow · commit a483c7921de7 · 2023-08-31T21:24:53.000-03:00
Optimize autocomplete
diff --git a/js/src/modules/functions.ts b/js/src/modules/functions.ts
@@ -1212,24 +1212,15 @@ function codeMirrorAutoCompleteOnInputRead (instance) {
                                     columns: []
                                 };
 
-                                for (var column in columns) {
-                                    if (columns.hasOwnProperty(column)) {
-                                        var displayText = columns[column].Type;
-                                        if (columns[column].Key === 'PRI') {
-                                            displayText += ' | Primary';
-                                        } else if (columns[column].Key === 'UNI') {
-                                            displayText += ' | Unique';
-                                        }
-
-                                        // @ts-ignore
-                                        table.columns.push({
-                                            text: column,
-                                            displayText: column + ' | ' + displayText,
-                                            columnName: column,
-                                            columnHint: displayText,
-                                            render: columnHintRender
-                                        });
-                                    }
+                                for (let column of columns) {
+                                    // @ts-ignore
+                                    table.columns.push({
+                                        text: column.field,
+                                        displayText: column.field + ' | ' + column.columnHint,
+                                        columnName: column.field,
+                                        columnHint: column.columnHint,
+                                        render: columnHintRender
+                                    });
                                 }
                             }
 
diff --git a/src/Controllers/Database/SqlAutoCompleteController.php b/src/Controllers/Database/SqlAutoCompleteController.php
@@ -11,6 +11,9 @@
 use PhpMyAdmin\ResponseRenderer;
 use PhpMyAdmin\Template;
 
+use function array_map;
+use function array_values;
+
 /**
  * Table/Column autocomplete in SQL editors.
  */
@@ -29,7 +32,17 @@ public function __invoke(ServerRequest $request): void
             if ($db) {
                 $tableNames = $this->dbi->getTables($db);
                 foreach ($tableNames as $tableName) {
-                    $sqlAutocomplete[$tableName] = $this->dbi->getColumns($db, $tableName);
+                    $sqlAutocomplete[$tableName] = array_map(
+                        static fn (array $field): array => [
+                            'field' => $field['Field'],
+                            'columnHint' => $field['Type'] . match ($field['Key']) {
+                                'PRI' => ' | Primary',
+                                'UNI' => ' | Unique',
+                                default=> ''
+                            },
+                        ],
+                        array_values($this->dbi->getColumns($db, $tableName)),
+                    );
                 }
             }
         }
