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

SYNC: fixed SQLite E2E tests (use absolute folder)

Browse Source
This commit is contained in:
SPRINX0\prochazka
2025-03-05 15:25:08 +01:00
committed by Diflow
parent 0ece662d8c
commit b40168182a
6 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e2e-tests/clearTestingData.js
View File

@@ -17,8 +17,8 @@ function clearTestingData() {
if (fs.existsSync(path.join(baseDir, 'archive-e2etests'))) { if (fs.existsSync(path.join(baseDir, 'archive-e2etests'))) {
fs.rmdirSync(path.join(baseDir, 'archive-e2etests'), { recursive: true }); fs.rmdirSync(path.join(baseDir, 'archive-e2etests'), { recursive: true });
} }
if (fs.existsSync(path.join(__dirname, '../my_guitar_shop.db'))) { if (fs.existsSync(path.join(__dirname, 'tmpdata', 'my_guitar_shop.db'))) {
fs.unlinkSync(path.join(__dirname, '../my_guitar_shop.db')); fs.unlinkSync(path.join(__dirname, 'tmpdata', 'my_guitar_shop.db'));
} }
} }

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

@@ -1,4 +1,5 @@
CONNECTIONS=mysql,postgres,mssql,oracle,sqlite CONNECTIONS=mysql,postgres,mssql,oracle,sqlite
LOG_CONNECTION_SENSITIVE_VALUES=true
LABEL_mysql=MySql-connection LABEL_mysql=MySql-connection
SERVER_mysql=localhost SERVER_mysql=localhost
@@ -32,5 +33,5 @@ PORT_mssql=16014
ENGINE_mssql=mssql@dbgate-plugin-mssql ENGINE_mssql=mssql@dbgate-plugin-mssql
LABEL_sqlite=Sqlite-connection LABEL_sqlite=Sqlite-connection
FILE_sqlite=my_guitar_shop.db FILE_sqlite=%%E2E_TEST_DATA_DIRECTORY%%/my_guitar_shop.db
ENGINE_sqlite=sqlite@dbgate-plugin-sqlite ENGINE_sqlite=sqlite@dbgate-plugin-sqlite

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

@@ -97,7 +97,10 @@ async function run() {
if (localconfig.sqlite) { if (localconfig.sqlite) {
await createDb( await createDb(
{ {
databaseFile: process.env.FILE_sqlite, databaseFile: process.env.FILE_sqlite.replace(
'%%E2E_TEST_DATA_DIRECTORY%%',
path.join(path.dirname(__dirname), 'tmpdata')
),
singleDatabase: true, singleDatabase: true,
engine: 'sqlite@dbgate-plugin-sqlite', engine: 'sqlite@dbgate-plugin-sqlite',
}, },

0
e2e-tests/tmpdata/.gitkeep Normal file
View File

5
packages/api/src/controllers/connections.js
View File

@@ -62,7 +62,10 @@ function getPortalCollections() {
port: process.env[`PORT_${id}`], port: process.env[`PORT_${id}`],
databaseUrl: process.env[`URL_${id}`], databaseUrl: process.env[`URL_${id}`],
useDatabaseUrl: !!process.env[`URL_${id}`], useDatabaseUrl: !!process.env[`URL_${id}`],
databaseFile: process.env[`FILE_${id}`], databaseFile: process.env[`FILE_${id}`]?.replace(
'%%E2E_TEST_DATA_DIRECTORY%%',
path.join(path.dirname(path.dirname(__dirname)), 'e2e-tests', 'tmpdata')
),
socketPath: process.env[`SOCKET_PATH_${id}`], socketPath: process.env[`SOCKET_PATH_${id}`],
serviceName: process.env[`SERVICE_NAME_${id}`], serviceName: process.env[`SERVICE_NAME_${id}`],
authType: process.env[`AUTH_TYPE_${id}`] || (process.env[`SOCKET_PATH_${id}`] ? 'socket' : undefined), authType: process.env[`AUTH_TYPE_${id}`] || (process.env[`SOCKET_PATH_${id}`] ? 'socket' : undefined),

3
packages/api/src/utility/crypting.js
View File

@@ -88,6 +88,9 @@ function decryptConnection(connection) {
} }
function pickSafeConnectionInfo(connection) { function pickSafeConnectionInfo(connection) {
if (process.env.LOG_CONNECTION_SENSITIVE_VALUES) {
return connection;
}
return _.mapValues(connection, (v, k) => { return _.mapValues(connection, (v, k) => {
if (k == 'engine' || k == 'port' || k == 'authType' || k == 'sshMode' || k == 'passwordMode') return v; if (k == 'engine' || k == 'port' || k == 'authType' || k == 'sshMode' || k == 'passwordMode') return v;
if (v === null || v === true || v === false) return v; if (v === null || v === true || v === false) return v;