github/dbx
4
0 Fork 0
mirror of https://github.com/t8y2/dbx.git synced 2026-11-15 06:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sql): keep column completion after subqueries

Browse Source
This commit is contained in:
t8y2 committed 2026-07-08 00:53:05 +08:00
1 parent b3f09219ab
commit 611f19fd8b
2 files changed
+79 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

apps/desktop/src/lib/sql/sqlCompletion.ts
+21 -2
View File
@@ -1670,7 +1670,7 @@ export function getSqlCompletionContext(sql: string, cursor: number): SqlComplet
const suggestRoutines = inCallRoutineContext || oracleTableFunctionContext || inPotentialPackageMemberContext || (!preferColumnsOverGlobalRoutines && !exclusiveTableSuggestions && !exclusiveColumnSuggestions && !insertInfo && prefix.length >= 2);
const statementKind = detectStatementKind(beforeCursor || fullStatement);
const preferredKeywords = preferredKeywordsForCompletion(beforeCursor, beforeToken, selectListColumnContext, exclusiveTableSuggestions, updateInfo, deleteInfo);
const preferredKeywords = qualifier ? [] : preferredKeywordsForCompletion(beforeCursor, beforeToken, selectListColumnContext, exclusiveTableSuggestions, updateInfo, deleteInfo);
const contextKind = detectCompletionContextKind({
qualifier,
exclusiveTableSuggestions,
@@ -3106,7 +3106,26 @@ function isFollowedByJoin(beforeToken: string): boolean {
function isInTableListContext(beforeToken: string): boolean {
if (isInOrderOrGroupByContext(beforeToken)) return false;
return /,\s*$/.test(beforeToken) && /\b(?:from|join|update|into)\b/i.test(beforeToken);
const cleaned = stripSqlLiterals(beforeToken).trimEnd();
if (!/,\s*$/.test(cleaned)) return false;
// Only commas in the active top-level table segment should continue table completion.
const lastTableIntro = Math.max(lastTopLevelKeywordIndex(cleaned, "from"), lastTopLevelKeywordIndex(cleaned, "join"), lastTopLevelKeywordIndex(cleaned, "update"), lastTopLevelKeywordIndex(cleaned, "into"));
if (lastTableIntro < 0) return false;
const lastBoundary = Math.max(
lastTopLevelKeywordIndex(cleaned, "where"),
lastTopLevelKeywordIndex(cleaned, "set"),
lastTopLevelKeywordIndex(cleaned, "group"),
lastTopLevelKeywordIndex(cleaned, "order"),
lastTopLevelKeywordIndex(cleaned, "having"),
lastTopLevelKeywordIndex(cleaned, "limit"),
lastTopLevelKeywordIndex(cleaned, "offset"),
lastTopLevelKeywordIndex(cleaned, "union"),
lastTopLevelKeywordIndex(cleaned, "intersect"),
lastTopLevelKeywordIndex(cleaned, "except"),
);
return lastBoundary < lastTableIntro;
}
function collectCompletionColumns(columnsByTable: Map<string, SqlCompletionColumn[]>): Array<SqlCompletionColumn & { key: string }> {