diff --git a/packages/tools/src/ScriptWriter.ts b/packages/tools/src/ScriptWriter.ts index 72c67e664..93d143212 100644 --- a/packages/tools/src/ScriptWriter.ts +++ b/packages/tools/src/ScriptWriter.ts @@ -1,7 +1,7 @@ import _uniq from 'lodash/uniq'; import { extractShellApiFunctionName, extractShellApiPlugins } from './packageTools'; -export class ScriptWriter { +export class ScriptWriterJavaScript { s = ''; packageNames: string[] = []; varCount = 0; @@ -169,7 +169,7 @@ export class ScriptWriterJson { export function jsonScriptToJavascript(json) { const { schedule, commands, packageNames } = json; - const script = new ScriptWriter(); + const script = new ScriptWriterJavaScript(); for (const packageName of packageNames) { if (!/^dbgate-plugin-.*$/.test(packageName)) { throw new Error('Unallowed package name:' + packageName); diff --git a/packages/web/src/impexp/createImpExpScript.ts b/packages/web/src/impexp/createImpExpScript.ts index 3414a306b..e280586bb 100644 --- a/packages/web/src/impexp/createImpExpScript.ts +++ b/packages/web/src/impexp/createImpExpScript.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; import moment from 'moment'; -import { ScriptWriter, ScriptWriterJson } from 'dbgate-tools'; +import { ScriptWriterJavaScript, ScriptWriterJson } from 'dbgate-tools'; import getAsArray from '../utility/getAsArray'; import { getConnectionInfo } from '../utility/metadataLoaders'; import { findEngineDriver, findObjectLike } from 'dbgate-tools'; @@ -207,7 +207,7 @@ export default async function createImpExpScript(extensions, values, forceScript const config = getCurrentConfig(); const script = config.allowShellScripting || forceScript - ? new ScriptWriter(values.startVariableIndex || 0) + ? new ScriptWriterJavaScript(values.startVariableIndex || 0) : new ScriptWriterJson(values.startVariableIndex || 0); const [sourceConnection, sourceDriver] = await getConnection( diff --git a/packages/web/src/utility/exportFileTools.ts b/packages/web/src/utility/exportFileTools.ts index b7d1bb76b..79a0c2a62 100644 --- a/packages/web/src/utility/exportFileTools.ts +++ b/packages/web/src/utility/exportFileTools.ts @@ -1,4 +1,4 @@ -import { ScriptWriter, ScriptWriterJson } from 'dbgate-tools'; +import { ScriptWriterJavaScript, ScriptWriterJson } from 'dbgate-tools'; import getElectron from './getElectron'; import { showSnackbar, @@ -11,49 +11,47 @@ import resolveApi, { resolveApiHeaders } from './resolveApi'; import { apiCall, apiOff, apiOn } from './api'; import { normalizeExportColumnMap } from '../impexp/createImpExpScript'; import { getCurrentConfig } from '../stores'; -import { showModal } from '../modals/modalTools'; -import RunScriptModal from '../modals/RunScriptModal.svelte'; import { QuickExportDefinition } from 'dbgate-types'; -export async function importSqlDump(inputFile, connection) { - const script = getCurrentConfig().allowShellScripting ? new ScriptWriter() : new ScriptWriterJson(); +// export async function importSqlDump(inputFile, connection) { +// const script = getCurrentConfig().allowShellScripting ? new ScriptWriterJavaScript() : new ScriptWriterJson(); - script.importDatabase({ - inputFile, - connection, - }); +// script.importDatabase({ +// inputFile, +// connection, +// }); - showModal(RunScriptModal, { script: script.getScript(), header: 'Importing database' }); +// showModal(RunScriptModal, { script: script.getScript(), header: 'Importing database' }); - // await runImportExportScript({ - // script: script.getScript(), - // runningMessage: 'Importing database', - // canceledMessage: 'Database import canceled', - // finishedMessage: 'Database import finished', - // }); -} +// // await runImportExportScript({ +// // script: script.getScript(), +// // runningMessage: 'Importing database', +// // canceledMessage: 'Database import canceled', +// // finishedMessage: 'Database import finished', +// // }); +// } -export async function exportSqlDump(outputFile, connection, databaseName, pureFileName) { - const script = getCurrentConfig().allowShellScripting ? new ScriptWriter() : new ScriptWriterJson(); +// export async function exportSqlDump(outputFile, connection, databaseName, pureFileName) { +// const script = getCurrentConfig().allowShellScripting ? new ScriptWriterJavaScript() : new ScriptWriterJson(); - script.dumpDatabase({ - connection, - databaseName, - outputFile, - }); +// script.dumpDatabase({ +// connection, +// databaseName, +// outputFile, +// }); - showModal(RunScriptModal, { - script: script.getScript(), - header: 'Exporting database', - onOpenResult: - pureFileName && !getElectron() - ? () => { - downloadFromApi(`uploads/get?file=${pureFileName}`, 'file.sql'); - } - : null, - openResultLabel: 'Download SQL file', - }); -} +// showModal(RunScriptModal, { +// script: script.getScript(), +// header: 'Exporting database', +// onOpenResult: +// pureFileName && !getElectron() +// ? () => { +// downloadFromApi(`uploads/get?file=${pureFileName}`, 'file.sql'); +// } +// : null, +// openResultLabel: 'Download SQL file', +// }); +// } async function runImportExportScript({ script, runningMessage, canceledMessage, finishedMessage, afterFinish = null }) { const electron = getElectron(); @@ -140,7 +138,7 @@ function generateQuickExportScript( dataName: string, columnMap ) { - const script = getCurrentConfig().allowShellScripting ? new ScriptWriter() : new ScriptWriterJson(); + const script = getCurrentConfig().allowShellScripting ? new ScriptWriterJavaScript() : new ScriptWriterJson(); const sourceVar = script.allocVariable(); script.assign(sourceVar, reader.functionName, reader.props);