Skip to content

Commit 3225560

Browse files
committed
Remove hangup on fetching schema list
Signed-off-by: worksofliam <[email protected]>
1 parent b3bd89d commit 3225560

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/language/providers/completionProvider.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ async function getObjectCompletions(
143143
forSchema: string,
144144
sqlTypes: { [index: string]: CompletionType }
145145
): Promise<CompletionItem[]> {
146+
forSchema = Statement.noQuotes(Statement.delimName(forSchema, true));
146147
const allObjects = await DbCache.getObjects(forSchema, Object.values(sqlTypes).map(k => k.type));
147148

148149
return allObjects.map((value) => {
@@ -330,13 +331,6 @@ async function getCompletionItemsForRefs(currentStatement: LanguageStatement.def
330331

331332
const curClause = currentStatement.getClauseForOffset(offset);
332333
const tokenAtOffset = currentStatement.getTokenByOffset(offset);
333-
let emptyObjectRefs: Boolean = false;
334-
335-
// Get all the schemas
336-
if (objectRefs.length === 0 && cteList.length === 0) {
337-
emptyObjectRefs = true;
338-
completionItems.push(...(await getCachedSchemas()));
339-
}
340334

341335
// Set the default schema for all references without one
342336
for (let ref of objectRefs) {
@@ -383,7 +377,7 @@ async function getCompletionItemsForRefs(currentStatement: LanguageStatement.def
383377
completionItems.push(...aliasItems);
384378

385379
// get completions for objects
386-
if (tokenAtOffset === undefined && (emptyObjectRefs || curClause !== ClauseType.Unknown)) {
380+
if (tokenAtOffset === undefined && (curClause !== ClauseType.Unknown)) {
387381
// get all the completion items for objects in each referenced schema
388382
completionItems.push(
389383
...(await getObjectCompletions(getDefaultSchema(), completionTypes))
@@ -436,6 +430,12 @@ async function getCompletionItemsForRefs(currentStatement: LanguageStatement.def
436430
}
437431
}
438432

433+
if (completionItems.length === 0) {
434+
// Get all the schemas
435+
// TODO: very very slow
436+
// completionItems.push(...(await getCachedSchemas()));
437+
}
438+
439439
return completionItems;
440440
}
441441

0 commit comments

Comments
 (0)