refactor createTableCandidates

Author: the21st

packages/server/src/complete/candidates/createJoinCandidates.ts

@@ -4,7 +4,7 @@ import { getNearestFromTableFromPos } from '../AstUtils'
 import { Table } from '../../database_libs/AbstractClient'
 import { toCompletionItemForKeyword } from '../CompletionItemUtils'
 import { Pos } from '../complete'
-import { createTableCandidates } from './createTableCandidates'
+import { createCatalogDatabaseAndTableCandidates } from './createTableCandidates'
 
 export function createJoinCondidates(
   ast: SelectStatement,
@@ -18,7 +18,7 @@ export function createJoinCondidates(
   const result: CompletionItem[] = []
   const fromTable = getNearestFromTableFromPos(ast.from?.tables || [], pos)
   if (fromTable && fromTable.type === 'table') {
-    result.push(...createTableCandidates(tables, token, true))
+    result.push(...createCatalogDatabaseAndTableCandidates(tables, token, true))
     result.push(toCompletionItemForKeyword('INNER JOIN'))
     result.push(toCompletionItemForKeyword('LEFT JOIN'))
     result.push(toCompletionItemForKeyword('ON'))

packages/server/src/complete/candidates/createTableCandidates.ts

@@ -19,7 +19,7 @@ function getFullyQualifiedTableName(table: Table): string {
   return table.tableName
 }
 
-export function createTableCandidates(
+export function createCatalogDatabaseAndTableCandidates(
   tables: Table[],
   lastToken: string,
   onFromClause?: boolean
@@ -55,13 +55,11 @@ export function createTableCandidates(
     return []
   })
 
-  const uniqueEntities = [...new Set(qualifiedEntities)]
-
-  return uniqueEntities
-    .map((aTableNameVariant) => {
+  return qualifiedEntities
+    .map((databaseEntity) => {
       return new Identifier(
         lastToken,
-        aTableNameVariant,
+        databaseEntity,
         '',
         ICONS.TABLE,
         onFromClause ? 'FROM' : 'OTHERS'

packages/server/src/complete/complete.ts

@@ -24,7 +24,7 @@ import {
   getNearestFromTableFromPos,
 } from './AstUtils'
 import { createBasicKeywordCandidates } from './candidates/createBasicKeywordCandidates'
-import { createTableCandidates } from './candidates/createTableCandidates'
+import { createCatalogDatabaseAndTableCandidates } from './candidates/createTableCandidates'
 import { createJoinCondidates } from './candidates/createJoinCandidates'
 import {
   createCandidatesForColumnsOfAnyTable,
@@ -181,11 +181,13 @@ class Completer {
   }
 
   addCandidatesForTables(tables: Table[], onFromClause: boolean) {
-    createTableCandidates(tables, this.lastToken, onFromClause).forEach(
-      (item) => {
-        this.addCandidate(item)
-      }
-    )
+    createCatalogDatabaseAndTableCandidates(
+      tables,
+      this.lastToken,
+      onFromClause
+    ).forEach((item) => {
+      this.addCandidate(item)
+    })
   }
 
   addCandidatesForColumnsOfAnyTable(tables: Table[]) {