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

close connection in finally block

Browse Source
This commit is contained in:
Jan Prochazka
2021-05-27 13:17:25 +02:00
parent 54ddfe2ef9
commit 84a67be272
3 changed files with 50 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
integration-tests/__tests__/object-analyse.spec.js
View File

@@ -1,4 +1,4 @@
const { connect, randomDbName } = require('../tools'); const { connect, randomDbName, testWrapper } = require('../tools');
const requireEngineDriver = require('dbgate-api/src/utility/requireEngineDriver'); const requireEngineDriver = require('dbgate-api/src/utility/requireEngineDriver');
const engines = require('../engines'); const engines = require('../engines');
const _ = require('lodash'); const _ = require('lodash');
@@ -7,7 +7,7 @@ const initSql = ['CREATE TABLE t1 (id int)', 'CREATE TABLE t2 (id int)'];
function flatSource() { function flatSource() {
return _.flatten( return _.flatten(
engines.map(engine => (engine.objects || []).map(object => [engine.label, object.type, engine, object])) engines.map(engine => (engine.objects || []).map(object => [engine.label, engine, object.type, object]))
); );
} }
@@ -16,47 +16,47 @@ const obj1Match = expect.objectContaining({
}); });
describe('Object analyse', () => { describe('Object analyse', () => {
test.each(flatSource())('Full analysis (%s - %s)', async (label, type, engine, object) => { test.each(flatSource())(
const conn = await connect(engine, randomDbName()); 'Full analysis (%s - %s)',
const driver = requireEngineDriver(engine.connection); testWrapper(async (conn, driver, engine, type, object) => {
for (const sql of initSql) await driver.query(conn, sql); for (const sql of initSql) await driver.query(conn, sql);
await driver.query(conn, object.create1); await driver.query(conn, object.create1);
const structure = await driver.analyseFull(conn); const structure = await driver.analyseFull(conn);
expect(structure[type].length).toEqual(1); expect(structure[type].length).toEqual(1);
expect(structure[type][0]).toEqual(obj1Match); expect(structure[type][0]).toEqual(obj1Match);
await driver.close(conn); })
}); );
test.each(flatSource())('Incremental analysis - add (%s - %s)', async (label, type, engine, object) => { test.each(flatSource())(
const conn = await connect(engine, randomDbName()); 'Incremental analysis - add (%s - %s)',
const driver = requireEngineDriver(engine.connection); testWrapper(async (conn, driver, engine, type, object) => {
for (const sql of initSql) await driver.query(conn, sql); for (const sql of initSql) await driver.query(conn, sql);
await driver.query(conn, object.create2); await driver.query(conn, object.create2);
const structure1 = await driver.analyseFull(conn); const structure1 = await driver.analyseFull(conn);
await driver.query(conn, object.create1); await driver.query(conn, object.create1);
const structure2 = await driver.analyseIncremental(conn, structure1); const structure2 = await driver.analyseIncremental(conn, structure1);
expect(structure2[type].length).toEqual(2); expect(structure2[type].length).toEqual(2);
expect(structure2[type].find(x => x.pureName == 'obj1')).toEqual(obj1Match); expect(structure2[type].find(x => x.pureName == 'obj1')).toEqual(obj1Match);
await driver.close(conn); })
}); );
test.each(flatSource())('Incremental analysis - drop (%s - %s)', async (label, type, engine, object) => { test.each(flatSource())(
const conn = await connect(engine, randomDbName()); 'Incremental analysis - drop (%s - %s)',
const driver = requireEngineDriver(engine.connection); testWrapper(async (conn, driver, engine, type, object) => {
for (const sql of initSql) await driver.query(conn, sql); for (const sql of initSql) await driver.query(conn, sql);
await driver.query(conn, object.create1); await driver.query(conn, object.create1);
await driver.query(conn, object.create2); await driver.query(conn, object.create2);
const structure1 = await driver.analyseFull(conn); const structure1 = await driver.analyseFull(conn);
await driver.query(conn, object.drop2); await driver.query(conn, object.drop2);
const structure2 = await driver.analyseIncremental(conn, structure1); const structure2 = await driver.analyseIncremental(conn, structure1);
expect(structure2[type].length).toEqual(1); expect(structure2[type].length).toEqual(1);
expect(structure2[type][0]).toEqual(obj1Match); expect(structure2[type][0]).toEqual(obj1Match);
await driver.close(conn); })
}); );
}); });

38
integration-tests/__tests__/table-analyse.spec.js
View File

@@ -1,6 +1,6 @@
const requireEngineDriver = require('dbgate-api/src/utility/requireEngineDriver'); const requireEngineDriver = require('dbgate-api/src/utility/requireEngineDriver');
const engines = require('../engines'); const engines = require('../engines');
const { connect, randomDbName } = require('../tools'); const { connect, randomDbName, testWrapper } = require('../tools');
const t1Sql = 'CREATE TABLE t1 (id int not null primary key, val varchar(50) null)'; const t1Sql = 'CREATE TABLE t1 (id int not null primary key, val varchar(50) null)';
const t1Match = expect.objectContaining({ const t1Match = expect.objectContaining({
@@ -26,33 +26,22 @@ const t1Match = expect.objectContaining({
}), }),
}); });
describe('Table analyse', () => { describe('Table analyse', () => {
test.each(engines.map(engine => [engine.label, engine]))( test.each(engines.map(engine => [engine.label, engine]))(
'Table structure - full analysis (%s)', 'Table structure - full analysis (%s)',
async (label, engine) => { testWrapper(async (conn, driver, engine) => {
const conn = await connect(engine, randomDbName()); await driver.query(conn, t1Sql);
try {
const driver = requireEngineDriver(engine.connection);
await driver.query(conn, t1Sql); const structure = await driver.analyseFull(conn);
const structure = await driver.analyseFull(conn); expect(structure.tables.length).toEqual(1);
expect(structure.tables[0]).toEqual(t1Match);
expect(structure.tables.length).toEqual(1); })
expect(structure.tables[0]).toEqual(t1Match);
} finally {
await driver.close(conn);
}
}
); );
test.each(engines.map(engine => [engine.label, engine]))( test.each(engines.map(engine => [engine.label, engine]))(
'Table add - incremental analysis (%s)', 'Table add - incremental analysis (%s)',
async (label, engine) => { testWrapper(async (conn, driver, engine) => {
const conn = await connect(engine, randomDbName());
const driver = requireEngineDriver(engine.connection);
await driver.query(conn, 'CREATE TABLE t0 (id0 int)'); await driver.query(conn, 'CREATE TABLE t0 (id0 int)');
const structure1 = await driver.analyseFull(conn); const structure1 = await driver.analyseFull(conn);
await driver.query(conn, t1Sql); await driver.query(conn, t1Sql);
@@ -60,16 +49,12 @@ describe('Table analyse', () => {
expect(structure2.tables.length).toEqual(2); expect(structure2.tables.length).toEqual(2);
expect(structure2.tables.find(x => x.pureName == 't1')).toEqual(t1Match); expect(structure2.tables.find(x => x.pureName == 't1')).toEqual(t1Match);
await driver.close(conn); })
}
); );
test.each(engines.map(engine => [engine.label, engine]))( test.each(engines.map(engine => [engine.label, engine]))(
'Table remove - incremental analysis (%s)', 'Table remove - incremental analysis (%s)',
async (label, engine) => { testWrapper(async (conn, driver, engine) => {
const conn = await connect(engine, randomDbName());
const driver = requireEngineDriver(engine.connection);
await driver.query(conn, t1Sql); await driver.query(conn, t1Sql);
await driver.query(conn, 'CREATE TABLE t2 (id2 int)'); await driver.query(conn, 'CREATE TABLE t2 (id2 int)');
const structure1 = await driver.analyseFull(conn); const structure1 = await driver.analyseFull(conn);
@@ -78,7 +63,6 @@ describe('Table analyse', () => {
expect(structure2.tables.length).toEqual(1); expect(structure2.tables.length).toEqual(1);
expect(structure2.tables[0]).toEqual(t1Match); expect(structure2.tables[0]).toEqual(t1Match);
await driver.close(conn); })
}
); );
}); });

4
integration-tests/tools.js
View File

@@ -45,10 +45,10 @@ async function connect(engine, database) {
} }
const testWrapper = body => async (label, engine, ...other) => { const testWrapper = body => async (label, engine, ...other) => {
const driver = requireEngineDriver(engine.connection);
const conn = await connect(engine, randomDbName()); const conn = await connect(engine, randomDbName());
try { try {
const driver = requireEngineDriver(engine.connection); await body(conn, driver, engine, ...other);
await body(driver, engine, ...other);
} finally { } finally {
await driver.close(conn); await driver.close(conn);
} }