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

#29 #190 code completion improvements

Browse Source
This commit is contained in:
Jan Prochazka
2021-11-14 20:31:45 +01:00
parent 74730b6d60
commit 39ee26e3f1
1 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,4 @@
import _ from 'lodash';
import { addCompleter, setCompleters } from 'ace-builds/src-noconflict/ext-language_tools'; import { addCompleter, setCompleters } from 'ace-builds/src-noconflict/ext-language_tools';
import { getDatabaseInfo } from '../utility/metadataLoaders'; import { getDatabaseInfo } from '../utility/metadataLoaders';
import analyseQuerySources from './analyseQuerySources'; import analyseQuerySources from './analyseQuerySources';
@@ -40,15 +41,25 @@ export function mountCodeCompletion({ conid, database, editor }) {
if (dbinfo) { if (dbinfo) {
const colMatch = line.match(/([a-zA-Z0-9_]+)\.([a-zA-Z0-9_]*)?$/); const colMatch = line.match(/([a-zA-Z0-9_]+)\.([a-zA-Z0-9_]*)?$/);
if (colMatch) { const lastKeywordMatch = line.match(/([a-zA-Z0-9_]*)\s*$/);
const table = colMatch[1]; const lastKeyword = lastKeywordMatch ? lastKeywordMatch[1].toUpperCase().trim() : '';
const sources = analyseQuerySources(editor.getValue(), [ const sources = analyseQuerySources(editor.getValue(), [
...dbinfo.tables.map(x => x.pureName), ...dbinfo.tables.map(x => x.pureName),
...dbinfo.views.map(x => x.pureName), ...dbinfo.views.map(x => x.pureName),
]); ]);
const sourceObjects = sources.map(src => {
const table = dbinfo.tables.find(x => x.pureName == src.name);
const view = dbinfo.views.find(x => x.pureName == src.name);
return { ...(table || view), alias: src.alias };
});
if (colMatch) {
const table = colMatch[1];
const source = sources.find(x => (x.alias || x.name) == table); const source = sources.find(x => (x.alias || x.name) == table);
console.log('sources', sources);
console.log('table', table, source); // console.log('sources', sources);
// console.log('table', table, source);
if (source) { if (source) {
const table = dbinfo.tables.find(x => x.pureName == source.name); const table = dbinfo.tables.find(x => x.pureName == source.name);
if (table) { if (table) {
@@ -62,10 +73,25 @@ export function mountCodeCompletion({ conid, database, editor }) {
})), })),
]; ];
} }
const view = dbinfo.views.find(x => x.pureName == source.name);
if (view) {
list = [
...view.columns.map(x => ({
name: x.columnName,
value: x.columnName,
caption: x.columnName,
meta: 'column',
score: 1000,
})),
];
}
} }
} else { } else {
const onlyTables =
lastKeyword == 'FROM' || lastKeyword == 'JOIN' || lastKeyword == 'UPDATE' || lastKeyword == 'DELETE';
list = [ list = [
...list, ...(onlyTables ? [] : list),
...dbinfo.tables.map(x => ({ ...dbinfo.tables.map(x => ({
name: x.pureName, name: x.pureName,
value: x.pureName, value: x.pureName,
@@ -80,6 +106,19 @@ export function mountCodeCompletion({ conid, database, editor }) {
meta: 'view', meta: 'view',
score: 1000, score: 1000,
})), })),
...(onlyTables
? []
: _.flatten(
sourceObjects.map(obj =>
obj.columns.map(col => ({
name: col.columnName,
value: obj.alias ? `${obj.alias}.${col.columnName}` : col.columnName,
caption: obj.alias ? `${obj.alias}.${col.columnName}` : col.columnName,
meta: 'column',
score: 1200,
}))
)
)),
]; ];
} }
} }
@@ -108,7 +147,7 @@ export function mountCodeCompletion({ conid, database, editor }) {
editor.execCommand('startAutocomplete'); editor.execCommand('startAutocomplete');
} }
if (e.args == ' ' && /((from)|(join))\s*$/i.test(line)) { if (e.args == ' ' && /((from)|(join)|(update))\s*$/i.test(line)) {
editor.execCommand('startAutocomplete'); editor.execCommand('startAutocomplete');
} }
} }