diff --git a/packages/tools/src/SqlDumper.ts b/packages/tools/src/SqlDumper.ts index 8da3b9522..54cd8c943 100644 --- a/packages/tools/src/SqlDumper.ts +++ b/packages/tools/src/SqlDumper.ts @@ -46,11 +46,12 @@ export class SqlDumper { } putValue(value) { if (value === null) this.putRaw('NULL'); - if (value === true) this.putRaw('1'); - if (value === false) this.putRaw('0'); + else if (value === true) this.putRaw('1'); + else if (value === false) this.putRaw('0'); else if (_isString(value)) this.putStringValue(value); else if (_isNumber(value)) this.putRaw(value.toString()); else if (_isDate(value)) this.putStringValue(new Date(value).toISOString()); + else this.putRaw('NULL'); } putCmd(format, ...args) { this.put(format, ...args); diff --git a/packages/tools/src/createBulkInsertStreamBase.ts b/packages/tools/src/createBulkInsertStreamBase.ts index 3eeb65804..eed503a48 100644 --- a/packages/tools/src/createBulkInsertStreamBase.ts +++ b/packages/tools/src/createBulkInsertStreamBase.ts @@ -69,6 +69,7 @@ export function createBulkInsertStreamBase(driver, stream, pool, name, options): } dmp.putRaw(';'); // require('fs').writeFileSync('/home/jena/test.sql', dmp.s); + // console.log(dmp.s); await driver.query(pool, dmp.s); }; diff --git a/packages/web/src/tabs/ShellTab.svelte b/packages/web/src/tabs/ShellTab.svelte index 290c6e2cc..cf048a0ab 100644 --- a/packages/web/src/tabs/ShellTab.svelte +++ b/packages/web/src/tabs/ShellTab.svelte @@ -35,6 +35,7 @@ import useEditorData from '../query/useEditorData'; import { activeTabId, getActiveTabId, nullStore } from '../stores'; import axiosInstance from '../utility/axiosInstance'; +import { changeTab } from '../utility/common'; import memberStore from '../utility/memberStore'; import socket from '../utility/socket'; import useEffect from '../utility/useEffect'; @@ -75,8 +76,13 @@ domEditor?.getEditor()?.focus(); } - $: effect = useEffect(() => registerRunnerDone(runnerId)); + $: { + changeTab(tabid, tab => ({ ...tab, busy })); + } + $: effect = useEffect(() => registerRunnerDone(runnerId)); + $: $effect; + function registerRunnerDone(rid) { if (rid) { socket.on(`runner-done-${rid}`, handleRunnerDone); @@ -88,8 +94,6 @@ } } - $: $effect; - function handleRunnerDone() { busy = false; timerLabel.stop();