dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-22 16:55: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
2025-02-25 15:20:07 +01:00
parent 517027e1fe b843ccc898
commit d5ddbca067
8 changed files with 98 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e2e-tests/.localconfig.js
View File

@@ -3,5 +3,5 @@ module.exports = {
postgres: true,
mssql: true,
oracle: true,
// sqlite: true,
sqlite: true,
};

2
e2e-tests/cypress.config.js
View File

@@ -1,6 +1,5 @@
const { defineConfig } = require('cypress');
const killPort = require('kill-port');
const { clearTestingData } = require('./e2eTestTools');
const waitOn = require('wait-on');
const { exec } = require('child_process');
const fs = require('fs');
@@ -14,7 +13,6 @@ module.exports = defineConfig({
// implement node event listeners here
on('before:spec', async details => {
await clearTestingData();
// console.log('********************* DETAILS *********************', JSON.stringify(details));
if (config.isInteractive) {

2
e2e-tests/cypress/e2e/browse-data.cy.js
View File

@@ -350,7 +350,7 @@ describe('Data browser data', () => {
cy.themeshot('comparesettings');
});
it('Query editor - AI assistant', () => {
it.skip('Query editor - AI assistant', () => {
cy.contains('MySql-connection').click();
cy.contains('MyChinook').click();
cy.testid('TabsPanel_buttonNewQuery').click();

3
e2e-tests/cypress/e2e/multi-sql.cy.js
View File

@@ -46,6 +46,9 @@ function multiTest(testName, testDefinition) {
})
);
}
if (localconfig.sqlite) {
it(testName + ' Sqlite', () => testDefinition('Sqlite-connection', 'sqlite@dbgate-plugin-sqlite'));
}
}
describe('Mutli-sql tests', () => {

6
e2e-tests/env/multi-sql/.env vendored
View File

@@ -1,4 +1,4 @@
CONNECTIONS=mysql,postgres,mssql,oracle
CONNECTIONS=mysql,postgres,mssql,oracle,sqlite
LABEL_mysql=MySql-connection
SERVER_mysql=localhost
@@ -30,3 +30,7 @@ USER_mssql=sa
PASSWORD_mssql=Pwd2020Db
PORT_mssql=16014
ENGINE_mssql=mssql@dbgate-plugin-mssql
LABEL_sqlite=Sqlite-connection
FILE_sqlite=my_guitar_shop.db
ENGINE_sqlite=sqlite@dbgate-plugin-sqlite

38
e2e-tests/init/multi-sql.js
View File

@@ -9,19 +9,23 @@ const dbgatePluginPostgres = require('dbgate-plugin-postgres');
dbgateApi.registerPlugins(dbgatePluginPostgres);
async function createDb(connection, dropDbSql, createDbSql, database = 'my_guitar_shop') {
try {
await dbgateApi.executeQuery({
connection,
sql: dropDbSql,
});
} catch (err) {
console.error('Failed to drop database', err);
if (dropDbSql) {
try {
await dbgateApi.executeQuery({
connection,
sql: dropDbSql,
});
} catch (err) {
console.error('Failed to drop database', err);
}
}
await dbgateApi.executeQuery({
connection,
sql: createDbSql,
});
if (createDbSql) {
await dbgateApi.executeQuery({
connection,
sql: createDbSql,
});
}
await dbgateApi.importDbFromFolder({
connection: {
@@ -89,6 +93,18 @@ async function run() {
'C##my_guitar_shop'
);
}
if (localconfig.sqlite) {
await createDb(
{
databaseFile: process.env.FILE_sqlite,
singleDatabase: true,
engine: 'sqlite@dbgate-plugin-sqlite',
},
null,
null
);
}
}
dbgateApi.runScript(run);

12
e2e-tests/package.json
View File

@@ -22,12 +22,12 @@
"cy:run:team": "cypress run --spec cypress/e2e/team.cy.js",
"cy:run:multi-sql": "cypress run --spec cypress/e2e/multi-sql.cy.js",
"start:add-connection": "cd .. && node packer/build/bundle.js --listen-api --run-e2e-tests",
"start:portal": "cd .. && env-cmd -f e2e-tests/env/portal/.env node e2e-tests/init/portal.js && env-cmd -f e2e-tests/env/portal/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
"start:oauth": "cd .. && env-cmd -f e2e-tests/env/oauth/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
"start:browse-data": "cd .. && env-cmd -f e2e-tests/env/browse-data/.env node e2e-tests/init/browse-data.js && env-cmd -f e2e-tests/env/browse-data/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
"start:team": "cd .. && env-cmd -f e2e-tests/env/team/.env node e2e-tests/init/team.js && env-cmd -f e2e-tests/env/team/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
"start:multi-sql": "cd .. && env-cmd -f e2e-tests/env/multi-sql/.env node e2e-tests/init/multi-sql.js && env-cmd -f e2e-tests/env/multi-sql/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
"start:add-connection": "node clearTestingData && cd .. && node packer/build/bundle.js --listen-api --run-e2e-tests",
"start:portal": "node clearTestingData && cd .. && env-cmd -f e2e-tests/env/portal/.env node e2e-tests/init/portal.js && env-cmd -f e2e-tests/env/portal/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
"start:oauth": "node clearTestingData && cd .. && env-cmd -f e2e-tests/env/oauth/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
"start:browse-data": "node clearTestingData && cd .. && env-cmd -f e2e-tests/env/browse-data/.env node e2e-tests/init/browse-data.js && env-cmd -f e2e-tests/env/browse-data/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
"start:team": "node clearTestingData && cd .. && env-cmd -f e2e-tests/env/team/.env node e2e-tests/init/team.js && env-cmd -f e2e-tests/env/team/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
"start:multi-sql": "node clearTestingData && cd .. && env-cmd -f e2e-tests/env/multi-sql/.env node e2e-tests/init/multi-sql.js && env-cmd -f e2e-tests/env/multi-sql/.env node packer/build/bundle.js --listen-api --run-e2e-tests",
"test:add-connection": "start-server-and-test start:add-connection http://localhost:3000 cy:run:add-connection",
"test:portal": "start-server-and-test start:portal http://localhost:3000 cy:run:portal",