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

refgactor, code cleanup

Browse Source
This commit is contained in:
SPRINX0\prochazka
2025-04-24 15:45:46 +02:00
parent 6cff7b3c30
commit e740db11ed
3 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/web/src/impexp/createImpExpScript.ts
View File

@@ -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(

72
packages/web/src/utility/exportFileTools.ts
View File

@@ -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);