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

postgre analyser supports compisite db names

Browse Source
This commit is contained in:
Jan Prochazka
2024-09-19 14:15:22 +02:00
parent f39ec26c29
commit b30f139b5d
27 changed files with 72 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/dbgate-plugin-postgres/src/backend/Analyser.js
View File

@@ -2,7 +2,8 @@ const fp = require('lodash/fp');
const _ = require('lodash');
const sql = require('./sql');
const { DatabaseAnalyser, isTypeString, isTypeNumeric } = global.DBGATE_PACKAGES['dbgate-tools'];
const { DatabaseAnalyser, isTypeString, isTypeNumeric, isCompositeDbName, splitCompositeDbName } =
global.DBGATE_PACKAGES['dbgate-tools'];
function normalizeTypeName(dataType) {
if (dataType == 'character varying') return 'varchar';
@@ -56,7 +57,12 @@ class Analyser extends DatabaseAnalyser {
createQuery(resFileName, typeFields, replacements = {}) {
const query = super.createQuery(sql[resFileName], typeFields, replacements);
return query;
const dbname = this.pool._database_name;
const schemaCondition = isCompositeDbName(dbname)
? `= '${splitCompositeDbName(dbname).schema}' `
: ' IS NOT NULL ';
return query.replace(/=SCHEMA_NAME_CONDITION/g, schemaCondition);
}
async _computeSingleObjectId() {