mirror of
https://github.com/DeNNiiInc/dbgate.git
synced 2026-05-01 16:43:59 +00:00
catch errors in base bulk importer
This commit is contained in:
@@ -4,6 +4,7 @@ import _fromPairs from 'lodash/fromPairs';
|
|||||||
import { getLogger } from './getLogger';
|
import { getLogger } from './getLogger';
|
||||||
import { prepareTableForImport } from './tableTransforms';
|
import { prepareTableForImport } from './tableTransforms';
|
||||||
import { RowProgressReporter } from './rowProgressReporter';
|
import { RowProgressReporter } from './rowProgressReporter';
|
||||||
|
import { extractErrorLogData } from './stringTools';
|
||||||
|
|
||||||
const logger = getLogger('bulkStreamBase');
|
const logger = getLogger('bulkStreamBase');
|
||||||
|
|
||||||
@@ -34,6 +35,7 @@ export function createBulkInsertStreamBase(driver: EngineDriver, stream, dbhan,
|
|||||||
};
|
};
|
||||||
|
|
||||||
writable.checkStructure = async () => {
|
writable.checkStructure = async () => {
|
||||||
|
try {
|
||||||
let structure = options.targetTableStructure ?? (await driver.analyseSingleTable(dbhan, name));
|
let structure = options.targetTableStructure ?? (await driver.analyseSingleTable(dbhan, name));
|
||||||
if (structure) {
|
if (structure) {
|
||||||
writable.structure = structure;
|
writable.structure = structure;
|
||||||
@@ -68,12 +70,17 @@ export function createBulkInsertStreamBase(driver: EngineDriver, stream, dbhan,
|
|||||||
writable.structure.columns.find(x => x.columnName == colName)?.dataType,
|
writable.structure.columns.find(x => x.columnName == colName)?.dataType,
|
||||||
])
|
])
|
||||||
);
|
);
|
||||||
|
} catch (err) {
|
||||||
|
logger.error(extractErrorLogData(err), 'Error during preparing bulk insert table, stopped');
|
||||||
|
writable.destroy(err);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
writable.send = async () => {
|
writable.send = async () => {
|
||||||
const rows = writable.buffer;
|
const rows = writable.buffer;
|
||||||
writable.buffer = [];
|
writable.buffer = [];
|
||||||
|
|
||||||
|
try {
|
||||||
if (driver.dialect.allowMultipleValuesInsert) {
|
if (driver.dialect.allowMultipleValuesInsert) {
|
||||||
const dmp = driver.createDumper();
|
const dmp = driver.createDumper();
|
||||||
dmp.putRaw(`INSERT INTO ${fullNameQuoted} (`);
|
dmp.putRaw(`INSERT INTO ${fullNameQuoted} (`);
|
||||||
@@ -99,7 +106,9 @@ export function createBulkInsertStreamBase(driver: EngineDriver, stream, dbhan,
|
|||||||
for (const row of rows) {
|
for (const row of rows) {
|
||||||
const dmp = driver.createDumper();
|
const dmp = driver.createDumper();
|
||||||
dmp.putRaw(`INSERT INTO ${fullNameQuoted} (`);
|
dmp.putRaw(`INSERT INTO ${fullNameQuoted} (`);
|
||||||
dmp.putCollection(',', writable.columnNames, col => dmp.putRaw(driver.dialect.quoteIdentifier(col as string)));
|
dmp.putCollection(',', writable.columnNames, col =>
|
||||||
|
dmp.putRaw(driver.dialect.quoteIdentifier(col as string))
|
||||||
|
);
|
||||||
dmp.putRaw(')\n VALUES\n');
|
dmp.putRaw(')\n VALUES\n');
|
||||||
|
|
||||||
dmp.putRaw('(');
|
dmp.putRaw('(');
|
||||||
@@ -117,6 +126,10 @@ export function createBulkInsertStreamBase(driver: EngineDriver, stream, dbhan,
|
|||||||
dmp.commitTransaction();
|
dmp.commitTransaction();
|
||||||
await driver.query(dbhan, dmp.s, { discardResult: true });
|
await driver.query(dbhan, dmp.s, { discardResult: true });
|
||||||
}
|
}
|
||||||
|
} catch (err) {
|
||||||
|
logger.error(extractErrorLogData(err), 'Error during base bulk insert, insert stopped');
|
||||||
|
writable.destroy(err);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
writable.sendIfFull = async () => {
|
writable.sendIfFull = async () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user