dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-05-01 06:13:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/dbgate/dbgate

Browse Source
This commit is contained in:
SPRINX0\prochazka
2024-12-20 13:45:41 +01:00
parent 6251bcd8fd b07ee91cf9
commit 54a3b30e83
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
integration-tests/__tests__/db-import-export.spec.js
View File

@@ -25,12 +25,13 @@ function createImportStream() {
} }
function createExportStream() { function createExportStream() {
const writable = new Stream.Writable({ objectMode: true }); const writable = new stream.Writable({ objectMode: true });
writable.result = []; writable.resultArray = [];
writable._write = (object, encoding, done) => { writable._write = (chunk, encoding, callback) => {
result.push(object); writable.resultArray.push(chunk);
done(); callback();
}; };
return writable;
} }
describe('DB Import/export', () => { describe('DB Import/export', () => {
@@ -115,7 +116,7 @@ describe('DB Import/export', () => {
testWrapper(async (conn, driver, engine) => { testWrapper(async (conn, driver, engine) => {
// const reader = await fakeObjectReader({ delay: 10 }); // const reader = await fakeObjectReader({ delay: 10 });
// const reader = await fakeObjectReader(); // const reader = await fakeObjectReader();
await runCommandOnDriver(conn, driver, 'create table ~t1 (~id int, ~country varchar(100))'); await runCommandOnDriver(conn, driver, 'create table ~t1 (~id int primary key, ~country varchar(100))');
const data = [ const data = [
[1, 'Czechia'], [1, 'Czechia'],
[2, 'Austria'], [2, 'Austria'],
@@ -125,18 +126,19 @@ describe('DB Import/export', () => {
[6, 'Bosna, Hecegovina'], [6, 'Bosna, Hecegovina'],
]; ];
for (const row of data) { for (const row of data) {
await runCommandOnDriver(conn, driver, 'insert into ~t1(~id, ~country) values (%v, %v)', ...row); await runCommandOnDriver(conn, driver, dmp =>
dmp.put('insert into ~t1(~id, ~country) values (%v, %v)', ...row)
);
} }
const reader = await tableReader({ const reader = await tableReader({
systemConnection: conn, systemConnection: conn,
driver, driver,
pureName: 't1', pureName: 't1',
createIfNotExists: true,
}); });
const writer = createExportStream(); const writer = createExportStream();
await copyStream(reader, writer); await copyStream(reader, writer);
expect(writer.result).toEqual(data); expect(writer.resultArray.filter(x => !x.__isStreamHeader).map(row => [row.id, row.country])).toEqual(data);
}) })
); );
}); });

4
integration-tests/engines.js
View File

@@ -580,11 +580,11 @@ const enginesOnLocal = [
// mysqlEngine, // mysqlEngine,
// mariaDbEngine, // mariaDbEngine,
// postgreSqlEngine, // postgreSqlEngine,
sqlServerEngine, // sqlServerEngine,
// sqliteEngine, // sqliteEngine,
// cockroachDbEngine, // cockroachDbEngine,
// clickhouseEngine, // clickhouseEngine,
// oracleEngine, oracleEngine,
]; ];
module.exports = process.env.CITEST ? enginesOnCi : enginesOnLocal; module.exports = process.env.CITEST ? enginesOnCi : enginesOnLocal;

7
packages/api/src/shell/tableReader.js
View File

@@ -8,12 +8,15 @@ const logger = getLogger('tableReader');
* @param {object} options * @param {object} options
* @param {connectionType} options.connection - connection object * @param {connectionType} options.connection - connection object
* @param {object} options.systemConnection - system connection (result of driver.connect). If not provided, new connection will be created * @param {object} options.systemConnection - system connection (result of driver.connect). If not provided, new connection will be created
* @param {object} options.driver - driver object. If not provided, it will be loaded from connection
* @param {string} options.pureName - table name * @param {string} options.pureName - table name
* @param {string} options.schemaName - schema name * @param {string} options.schemaName - schema name
* @returns {Promise<readerType>} - reader object * @returns {Promise<readerType>} - reader object
*/ */
async function tableReader({ connection, systemConnection, pureName, schemaName }) { async function tableReader({ connection, systemConnection, pureName, schemaName, driver }) {
const driver = requireEngineDriver(connection); if (!driver) {
driver = requireEngineDriver(connection);
}
const dbhan = systemConnection || (await connectUtility(driver, connection, 'read')); const dbhan = systemConnection || (await connectUtility(driver, connection, 'read'));
logger.info(`Connected.`); logger.info(`Connected.`);

3
plugins/dbgate-plugin-oracle/src/backend/driver.js
View File

@@ -306,12 +306,9 @@ const driver = {
} }
wasHeader = true; wasHeader = true;
} }
pass.write(zipDataRow(row, columns));
}); });
query.on('data', row => { query.on('data', row => {
// console.log('readQuery data', row);
pass.write(zipDataRow(row, columns)); pass.write(zipDataRow(row, columns));
}); });