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

FEAT: column name collision resolving #1234 (MySQL))

Browse Source
This commit is contained in:
SPRINX0\prochazka
2025-11-03 16:30:56 +01:00
parent fd4cc6a1e8
commit 0919f4c85b
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/tools/src/nameTools.ts
View File

@@ -1,4 +1,5 @@
import _cloneDeep from 'lodash/cloneDeep'; import _cloneDeep from 'lodash/cloneDeep';
import _uniq from 'lodash/uniq';
import _isString from 'lodash/isString'; import _isString from 'lodash/isString';
import type { import type {
ColumnInfo, ColumnInfo,
@@ -77,7 +78,20 @@ export function findForeignKeyForColumn(table: TableInfo, column: ColumnInfo | s
export function makeUniqueColumnNames(res: ColumnInfo[]) { export function makeUniqueColumnNames(res: ColumnInfo[]) {
const usedNames = new Set(); const usedNames = new Set();
const conflictingNames = new Set(
_uniq(res.map(x => x.columnName).filter((item, index, arr) => arr.indexOf(item) !== index))
);
for (let i = 0; i < res.length; i++) { for (let i = 0; i < res.length; i++) {
if (
conflictingNames.has(res[i].columnName) &&
res[i].pureName &&
!usedNames.has(`${res[i].pureName}_${res[i].columnName}`)
) {
res[i].columnName = `${res[i].pureName}_${res[i].columnName}`;
usedNames.add(res[i].columnName);
continue;
}
if (usedNames.has(res[i].columnName)) { if (usedNames.has(res[i].columnName)) {
let suffix = 2; let suffix = 2;
while (usedNames.has(`${res[i].columnName}${suffix}`)) suffix++; while (usedNames.has(`${res[i].columnName}${suffix}`)) suffix++;

1
plugins/dbgate-plugin-mysql/src/backend/drivers.js
View File

@@ -15,6 +15,7 @@ function extractColumns(fields) {
if (fields) { if (fields) {
const res = fields.map(col => ({ const res = fields.map(col => ({
columnName: col.name, columnName: col.name,
pureName: col.orgTable,
})); }));
makeUniqueColumnNames(res); makeUniqueColumnNames(res);
return res; return res;