Skip to content

Commit 2103aac

Browse files
committed
Only suggest FROM clause tables after SELECT
Only suggest tables and aliases that are in the FROM clause after SELECT keyword, instead of all tables
1 parent 9c5769b commit 2103aac

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ export function createAliasCandidates(
77
token: string
88
): CompletionItem[] {
99
return fromNodes
10-
.map((fromNode) => fromNode.as)
10+
.map(
11+
(fromNode) => fromNode.as ?? ('table' in fromNode ? fromNode.table : null)
12+
)
1113
.filter((aliasName) => aliasName && aliasName.startsWith(token))
1214
.map((aliasName) => toCompletionItemForAlias(aliasName || ''))
1315
}

packages/server/src/complete/complete.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@ class Completer {
327327
// Could be an alias or an unscoped column
328328
this.addCandidatesForUnscopedColumns(fromNodes, schemaAndSubqueries)
329329
this.addCandidatesForAliases(fromNodes)
330-
this.addCandidatesForTables(schemaAndSubqueries, true)
331330
this.addCandidatesForFunctions()
332331
}
333332
}

0 commit comments

Comments
 (0)