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

Fixed separate schema mode, more logging #894

Browse Source
This commit is contained in:
Jan Prochazka
2024-09-26 08:12:51 +02:00
parent 61a9f02899
commit 7a5abb5f47
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/api/src/proc/databaseConnectionProcess.js
View File

@@ -1,7 +1,7 @@
const stableStringify = require('json-stable-stringify');
const { splitQuery } = require('dbgate-query-splitter');
const childProcessChecker = require('../utility/childProcessChecker');
const { extractBoolSettingsValue, extractIntSettingsValue, getLogger, isCompositeDbName } = require('dbgate-tools');
const { extractBoolSettingsValue, extractIntSettingsValue, getLogger, isCompositeDbName, dbNameLogCategory } = require('dbgate-tools');
const requireEngineDriver = require('../utility/requireEngineDriver');
const connectUtility = require('../utility/connectUtility');
const { handleProcessCommunication } = require('../utility/processComm');
@@ -46,6 +46,12 @@ async function checkedAsyncCall(promise) {
let loadingModel = false;
async function handleFullRefresh() {
if (storedConnection.useSeparateSchemas && !isCompositeDbName(dbhan?.database)) {
resolveAnalysedPromises();
// skip loading DB structure
return;
}
loadingModel = true;
const driver = requireEngineDriver(storedConnection);
setStatusName('loadStructure');
@@ -60,6 +66,11 @@ async function handleFullRefresh() {
}
async function handleIncrementalRefresh(forceSend) {
if (storedConnection.useSeparateSchemas && !isCompositeDbName(dbhan?.database)) {
resolveAnalysedPromises();
// skip loading DB structure
return;
}
loadingModel = true;
const driver = requireEngineDriver(storedConnection);
setStatusName('checkStructure');
@@ -117,7 +128,7 @@ async function handleConnect({ connection, structure, globalSettings }) {
logger.debug(
`Connected to database, driver: ${storedConnection.engine}, separate schemas: ${
storedConnection.useSeparateSchemas ? 'YES' : 'NO'
}, 'DB: ${isCompositeDbName(dbhan.database) ? 'composite' : dbhan.database ? 'simple' : 'NO'} }`
}, 'DB: ${dbNameLogCategory(dbhan.database)} }`
);
dbhan.feedback = feedback => setStatus({ feedback });
await checkedAsyncCall(readVersion());