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

fixed some tests

Browse Source
This commit is contained in:
Jan Prochazka
2024-12-13 12:46:22 +01:00
parent ad4a599800
commit 35d791bee4
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
integration-tests/__tests__/alter-database.spec.js
View File

@@ -3,7 +3,13 @@ const _ = require('lodash');
const fp = require('lodash/fp'); const fp = require('lodash/fp');
const { testWrapper } = require('../tools'); const { testWrapper } = require('../tools');
const engines = require('../engines'); const engines = require('../engines');
const { getAlterDatabaseScript, extendDatabaseInfo, generateDbPairingId } = require('dbgate-tools'); const {
getAlterDatabaseScript,
extendDatabaseInfo,
generateDbPairingId,
formatQueryWithoutParams,
runCommandOnDriver,
} = require('dbgate-tools');
const initSql = ['CREATE TABLE t1 (id int primary key)', 'CREATE TABLE t2 (id int primary key)']; const initSql = ['CREATE TABLE t1 (id int primary key)', 'CREATE TABLE t2 (id int primary key)'];
@@ -63,7 +69,7 @@ describe('Alter database', () => {
db => { db => {
_.remove(db[type], x => x.pureName == 'obj1'); _.remove(db[type], x => x.pureName == 'obj1');
}, },
object.create1 formatQueryWithoutParams(driver, object.create1)
); );
expect(db[type].length).toEqual(0); expect(db[type].length).toEqual(0);
}) })
@@ -74,7 +80,7 @@ describe('Alter database', () => {
testWrapper(async (conn, driver, type, object, engine) => { testWrapper(async (conn, driver, type, object, engine) => {
for (const sql of initSql) await driver.query(conn, sql, { discardResult: true }); for (const sql of initSql) await driver.query(conn, sql, { discardResult: true });
await driver.query(conn, object.create1, { discardResult: true }); await runCommandOnDriver(conn, driver, object.create1);
const structure = extendDatabaseInfo(await driver.analyseFull(conn)); const structure = extendDatabaseInfo(await driver.analyseFull(conn));

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

@@ -99,10 +99,10 @@ describe('Object analyse', () => {
test.each(flatSourceParameters())( test.each(flatSourceParameters())(
'Test parameters simple analyse - %s - %s', 'Test parameters simple analyse - %s - %s',
testWrapper(async (conn, driver, testName, parameter, engine) => { testWrapper(async (conn, driver, testName, parameter, engine) => {
for (const sql of initSql) await driver.query(conn, sql, { discardResult: true }); for (const sql of initSql) await runCommandOnDriver(conn, driver, sql);
for (const sql of engine.parametersOtherSql) await driver.query(conn, sql, { discardResult: true }); for (const sql of engine.parametersOtherSql) await runCommandOnDriver(conn, driver, sql);
await driver.query(conn, parameter.create, { discardResult: true }); await runCommandOnDriver(conn, driver, parameter.create);
const structure = await driver.analyseFull(conn); const structure = await driver.analyseFull(conn);
const parameters = structure[parameter.objectTypeField].find(x => x.pureName == 'obj1').parameters; const parameters = structure[parameter.objectTypeField].find(x => x.pureName == 'obj1').parameters;
@@ -117,15 +117,15 @@ describe('Object analyse', () => {
test.each(flatSourceParameters())( test.each(flatSourceParameters())(
'Test parameters create SQL - %s - %s', 'Test parameters create SQL - %s - %s',
testWrapper(async (conn, driver, testName, parameter, engine) => { testWrapper(async (conn, driver, testName, parameter, engine) => {
for (const sql of initSql) await driver.query(conn, sql, { discardResult: true }); for (const sql of initSql) await runCommandOnDriver(conn, driver, sql);
for (const sql of engine.parametersOtherSql) await driver.query(conn, sql, { discardResult: true }); for (const sql of engine.parametersOtherSql) await runCommandOnDriver(conn, driver, sql);
await driver.query(conn, parameter.create, { discardResult: true }); await runCommandOnDriver(conn, driver, parameter.create);
const structure1 = await driver.analyseFull(conn); const structure1 = await driver.analyseFull(conn);
await driver.query(conn, parameter.drop, { discardResult: true }); await runCommandOnDriver(conn, driver, parameter.drop);
const obj = structure1[parameter.objectTypeField].find(x => x.pureName == 'obj1'); const obj = structure1[parameter.objectTypeField].find(x => x.pureName == 'obj1');
await driver.script(conn, obj.createSql); await runCommandOnDriver(conn, driver, obj.createSql);
const structure2 = await driver.analyseFull(conn); const structure2 = await driver.analyseFull(conn);
const parameters = structure2[parameter.objectTypeField].find(x => x.pureName == 'obj1').parameters; const parameters = structure2[parameter.objectTypeField].find(x => x.pureName == 'obj1').parameters;

4
integration-tests/engines.js
View File

@@ -424,14 +424,14 @@ end;$$`,
const filterLocal = [ const filterLocal = [
// filter local testing // filter local testing
'-MySQL', 'MySQL',
'-MariaDB', '-MariaDB',
'-PostgreSQL', '-PostgreSQL',
'-SQL Server', '-SQL Server',
'-SQLite', '-SQLite',
'-CockroachDB', '-CockroachDB',
'-ClickHouse', '-ClickHouse',
'Oracle', '-Oracle',
]; ];
const enginesPostgre = engines.filter(x => x.label == 'PostgreSQL'); const enginesPostgre = engines.filter(x => x.label == 'PostgreSQL');