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

Merge branch 'master' into feature/postgresql-export-bytea

Browse Source
This commit is contained in:
Stela Augustinova
2025-11-13 13:44:11 +01:00
parent 0f4f154637 5fd50dcf45
commit a3d9fe76d6
161 changed files with 5638 additions and 1627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/dbgate-plugin-postgres/src/backend/drivers.js
View File

@@ -13,6 +13,7 @@ const {
makeUniqueColumnNames,
extractDbNameFromComposite,
extractErrorLogData,
getConflictingColumnNames,
} = global.DBGATE_PACKAGES['dbgate-tools'];
let authProxy;
@@ -63,7 +64,23 @@ function extractPostgresColumns(result, dbhan) {
columnName: fld.name,
dataTypeId: fld.dataTypeID,
dataTypeName: typeIdToName[fld.dataTypeID],
tableId: fld.tableID,
}));
// const conflictingNames = getConflictingColumnNames(res);
// if (conflictingNames.size > 0) {
// const requiredTableIds = res.filter(x => conflictingNames.has(x.columnName)).map(x => x.tableId);
// const tableIdResult = await dbhan.client.query(
// `SELECT DISTINCT c.oid AS table_id, c.relname AS table_name
// FROM pg_class c
// WHERE c.oid IN (${requiredTableIds.join(',')})`
// );
// const tableIdToTableName = _.fromPairs(tableIdResult.rows.map(cur => [cur.table_id, cur.table_name]));
// for (const col of res) {
// col.pureName = tableIdToTableName[col.tableId];
// }
// }
makeUniqueColumnNames(res);
return res;
}
@@ -225,6 +242,7 @@ const drivers = driverBases.map(driverBase => ({
message: `${rowCount} rows affected`,
time: new Date(),
severity: 'info',
rowsAffected: rowCount,
});
}