generate script fixes

This commit is contained in:
Jan Prochazka
2020-06-06 22:17:17 +02:00
parent 74aa90fd2a
commit 617548cd50
6 changed files with 40 additions and 28 deletions

View File

@@ -2,25 +2,26 @@ export default class ScriptWriter {
constructor() {
this.s = '';
this.put('const dbgateApi = require("@dbgate/api");');
this.put();
this.put('async function run() {');
}
put(s) {
put(s = '') {
this.s += s;
this.s += '\n';
}
finish() {
this.put('await dbgateApi.copyStream(queryReader, csvWriter);');
this.put('dbgateApi.runScript(run);');
this.put('}');
this.put();
this.put('dbgateApi.runScript(run);');
}
assign(variableName, functionName, props) {
this.put(`const ${variableName} = await dbgateApi.${functionName}(${JSON.stringify(props)});`);
this.put(` const ${variableName} = await dbgateApi.${functionName}(${JSON.stringify(props)});`);
}
copyStream(sourceVar, targetVar) {
this.put(`await dbgateApi.copyStream(${sourceVar}, ${targetVar});`);
this.put(` await dbgateApi.copyStream(${sourceVar}, ${targetVar});`);
}
}

View File

@@ -1,24 +1,9 @@
import _ from 'lodash';
import ScriptCreator from './ScriptCreator';
import getAsArray from '../utility/getAsArray';
import { getConnectionInfo } from '../utility/metadataLoaders';
import engines from '@dbgate/engines';
function splitFullName(name) {
const i = name.indexOf('.');
if (i >= 0)
return {
schemaName: name.substr(0, i),
pureName: name.substr(i + 1),
};
return {
schemaName: null,
pureName: name,
};
}
function quoteFullName(dialect, { schemaName, pureName }) {
if (schemaName) return `${dialect.quoteIdentifier(schemaName)}.${dialect.quoteIdentifier(pureName)}`;
return `${dialect.quoteIdentifier(pureName)}`;
}
import { quoteFullName, fullNameFromString } from '@dbgate/datalib';
export default async function createImpExpScript(values) {
const script = new ScriptCreator();
@@ -29,10 +14,10 @@ export default async function createImpExpScript(values) {
const connection = await getConnectionInfo({ conid: values.sourceConnectionId });
const driver = engines(connection);
const fullName = splitFullName(table);
const fullName = fullNameFromString(table);
script.assign(sourceVar, 'queryReader', {
connection: {
...connection,
..._.pick(connection, ['server', 'engine', 'user', 'password', 'port']),
database: values.sourceDatabaseName,
},
sql: `select * from ${quoteFullName(driver.dialect, fullName)}`,