Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ class CompletionProviderManager {

public onParserChange = (sqlStatementList: SqlStatement[], curStatement?: SqlStatement) => {
this.sqlStatementList = sqlStatementList;
this.originColumnList = [];
if (curStatement) {
const { tableColumns } = curStatement;
const columns = (tableColumns || []).reduce((acc: ISimpleColumnVO[], cur) => {
Expand All @@ -254,10 +255,7 @@ class CompletionProviderManager {
return;
}

setTimeout(() => {
// this.registerParserColumnProvider(columns);
this.originColumnList = columns ?? [];
}, 1000);
this.originColumnList = columns;
}
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import assert from 'node:assert/strict';
import { getSqlCompletionContextId } from './sqlCompletionContext';
import './sqlParserRequestCoordinator.test';

assert.equal(
getSqlCompletionContextId({ consoleId: 42, workspaceTabId: 99 }),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
export interface SqlExecutionPosition {
lineNumber: number;
column: number;
}

export interface SqlExecutionTargetSnapshot {
selectedSql: string;
cursorPosition: SqlExecutionPosition | null;
}

export interface ResolvedSqlExecutionTarget {
sql: string;
single: boolean;
}

export function createSqlExecutionTargetSnapshot(
selectedSql: string | null | undefined,
cursorPosition: SqlExecutionPosition | null | undefined,
): SqlExecutionTargetSnapshot {
return {
selectedSql: selectedSql || '',
cursorPosition: cursorPosition
? {
lineNumber: cursorPosition.lineNumber,
column: cursorPosition.column,
}
: null,
};
}

export function resolveSqlExecutionTarget(
snapshot: SqlExecutionTargetSnapshot,
getCursorSql: (position: SqlExecutionPosition) => string,
): ResolvedSqlExecutionTarget {
const sql = snapshot.selectedSql || (snapshot.cursorPosition ? getCursorSql(snapshot.cursorPosition) : '');
return {
sql,
single: !snapshot.selectedSql,
};
}
Loading
Loading