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

#26

Browse Source
This commit is contained in:
Jan Prochazka
2020-05-31 20:37:50 +02:00
parent 67e19b9def
commit 4b53e66100
2 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/web/src/sqleditor/analyseQuerySources.js
View File

@@ -18,7 +18,7 @@ export default function analyseQuerySources(sql, sourceNames) {
res.push({ res.push({
name: word, name: word,
}); });
} else if (/^(where)|(inner)|(left)|(right)|(on)$/i.test(postWord)) { } else if (/^(where)|(inner)|(left)|(right)|(on)|(join)$/i.test(postWord)) {
res.push({ res.push({
name: word, name: word,
}); });

59
packages/web/src/sqleditor/useCodeCompletion.js
View File

@@ -19,6 +19,7 @@ const COMMON_KEYWORDS = [
'view', 'view',
'execute', 'execute',
'procedure', 'procedure',
'distinct',
]; ];
export default function useCodeCompletion({ conid, database, tabVisible, currentEditorRef }) { export default function useCodeCompletion({ conid, database, tabVisible, currentEditorRef }) {
@@ -40,8 +41,32 @@ export default function useCodeCompletion({ conid, database, tabVisible, current
score: 800, score: 800,
})); }));
if (/(join)|(from)|(update)|(delete)|(insert)\s*([a-zA-Z0-9_]*)?$/i.test(line)) { if (dbinfo) {
if (dbinfo) { const colMatch = line.match(/([a-zA-Z0-9_]+)\.([a-zA-Z0-9_]*)?$/);
if (colMatch) {
const table = colMatch[1];
const sources = analyseQuerySources(editor.getValue(), [
...dbinfo.tables.map((x) => x.pureName),
...dbinfo.views.map((x) => x.pureName),
]);
const source = sources.find((x) => (x.alias || x.name) == table);
console.log('sources', sources);
console.log('table', table, source);
if (source) {
const table = dbinfo.tables.find((x) => x.pureName == source.name);
if (table) {
list = [
...table.columns.map((x) => ({
name: x.columnName,
value: x.columnName,
caption: x.columnName,
meta: 'column',
score: 1000,
})),
];
}
}
} else {
list = [ list = [
...list, ...list,
...dbinfo.tables.map((x) => ({ ...dbinfo.tables.map((x) => ({
@@ -62,30 +87,10 @@ export default function useCodeCompletion({ conid, database, tabVisible, current
} }
} }
const colMatch = line.match(/([a-zA-Z0-9_]+)\.([a-zA-Z0-9_]*)?$/); // if (/(join)|(from)|(update)|(delete)|(insert)\s*([a-zA-Z0-9_]*)?$/i.test(line)) {
if (colMatch && dbinfo) { // if (dbinfo) {
const table = colMatch[1]; // }
const sources = analyseQuerySources(editor.getValue(), [ // }
...dbinfo.tables.map((x) => x.pureName),
...dbinfo.views.map((x) => x.pureName),
]);
const source = sources.find((x) => (x.alias || x.name) == table);
if (source) {
const table = dbinfo.tables.find((x) => x.pureName == source.name);
if (table) {
list = [
...list,
...table.columns.map((x) => ({
name: x.columnName,
value: x.columnName,
caption: x.columnName,
meta: 'column',
score: 1000,
})),
];
}
}
}
callback(null, list); callback(null, list);
}, },
@@ -102,7 +107,7 @@ export default function useCodeCompletion({ conid, database, tabVisible, current
if (e.command.name === 'backspace') { if (e.command.name === 'backspace') {
// do not hide after backspace // do not hide after backspace
} else if (e.command.name === 'insertstring') { } else if (e.command.name === 'insertstring') {
if (!hasCompleter || e.args == '.') { if ((!hasCompleter && /^[a-zA-Z]/.test(e.args)) || e.args == '.') {
editor.execCommand('startAutocomplete'); editor.execCommand('startAutocomplete');
} }