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

fixes + sqlite error line number

Browse Source
This commit is contained in:
Jan Prochazka
2022-09-25 20:06:34 +02:00
parent 7781ad69cf
commit 2b26779ea8
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/api/src/proc/sessionProcess.js
View File

@@ -156,7 +156,7 @@ class StreamHandler {
this.resolve(); this.resolve();
} }
info(info) { info(info) {
if (info.line != null) { if (info && info.line != null) {
info = { info = {
...info, ...info,
line: this.startLine + info.line, line: this.startLine + info.line,
@@ -168,7 +168,8 @@ class StreamHandler {
function handleStream(driver, resultIndexHolder, sqlItem) { function handleStream(driver, resultIndexHolder, sqlItem) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const handler = new StreamHandler(resultIndexHolder, resolve, sqlItem.trimStart.line); const start = sqlItem.trimStart || sqlItem.start;
const handler = new StreamHandler(resultIndexHolder, resolve, start && start.line);
driver.stream(systemConnection, sqlItem.text, handler); driver.stream(systemConnection, sqlItem.text, handler);
}); });
} }

2
packages/web/src/query/SocketMessageView.svelte
View File

@@ -49,7 +49,7 @@
$: { $: {
if (onChangeErrors) { if (onChangeErrors) {
const errors = displayedMessages.filter(x => x.severity == 'error'); const errors = displayedMessages.filter(x => x.severity == 'error' && x.line != null);
if (lastErrorMessageCountRef.get() != errors.length) { if (lastErrorMessageCountRef.get() != errors.length) {
onChangeErrors( onChangeErrors(
errors.map(err => ({ errors.map(err => ({

4
plugins/dbgate-plugin-sqlite/src/backend/driver.js
View File

@@ -104,10 +104,10 @@ const driver = {
inTransaction(); inTransaction();
} catch (error) { } catch (error) {
console.log('ERROR', error); console.log('ERROR', error);
const { message, lineNumber, procName } = error; const { message, procName } = error;
options.info({ options.info({
message, message,
line: lineNumber, line: 0,
procedure: procName, procedure: procName,
time: new Date(), time: new Date(),
severity: 'error', severity: 'error',