dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-19 21:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

default schema refactor

Browse Source
This commit is contained in:
Jan Prochazka
2024-09-19 13:41:49 +02:00
parent 9eb27f5e92
commit 8c3c32aeba
9 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/web/src/query/codeCompletion.ts
View File

@@ -1,8 +1,10 @@
import _ from 'lodash';
import { addCompleter, setCompleters } from 'ace-builds/src-noconflict/ext-language_tools';
import { getDatabaseInfo, getSchemaList } from '../utility/metadataLoaders';
import { getConnectionInfo, getDatabaseInfo, getSchemaList } from '../utility/metadataLoaders';
import analyseQuerySources from './analyseQuerySources';
import { getStringSettingsValue } from '../settings/settingsTools';
import { findEngineDriver, findDefaultSchema } from 'dbgate-tools';
import { getExtensions } from '../stores';
const COMMON_KEYWORDS = [
'select',
@@ -79,6 +81,9 @@ export function mountCodeCompletion({ conid, database, editor, getText }) {
const line = session.getLine(cursor.row).slice(0, cursor.column);
const dbinfo = await getDatabaseInfo({ conid, database });
const schemaList = await getSchemaList({ conid, database });
const connection = await getConnectionInfo(conid);
const driver = findEngineDriver(connection, getExtensions());
const defaultSchema = findDefaultSchema(schemaList, driver.dialect);
const convertUpper = getStringSettingsValue('sqlEditor.sqlCommandsCase', 'upperCase') == 'upperCase';
@@ -168,11 +173,7 @@ export function mountCodeCompletion({ conid, database, editor, getText }) {
} else {
list = [
...(onlyTables ? [] : list),
...createTableLikeList(
schemaList,
dbinfo,
x => !dbinfo.defaultSchema || dbinfo.defaultSchema == x.schemaName
),
...createTableLikeList(schemaList, dbinfo, x => !defaultSchema || defaultSchema == x.schemaName),
...(onlyTables
? []