mirror/chartdb
1
0
Fork 0
mirror of https://github.com/chartdb/chartdb.git synced 2026-02-09 13:14:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: properly merge inline refs with notes in DBML export (#1019)

Browse Source
This commit is contained in:
Guy Ben-Aharon
2025-12-17 18:52:06 +02:00
committed by GitHub
parent f140d0528f
commit e977ba5ef2
4 changed files with 86 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/dbml/dbml-export/__tests__/cases/7.inline.dbml Normal file
View File

@@ -0,0 +1,14 @@
Table "clean"."wms_item" {
"id" int64 [note: '''| Źródło: [WMS].[dbo].[wms_items].[id] | Tabele docelowe: [BQ].[reporting].[dim_products_history].[wms_prod_id] | Czym jest dana kolumna: jest to \'WMS\'owe\' id produktu | Informacje dodatkowe: brak''', ref: < "reporting"."wms_dim_products_history"."wms_id_prod"]
"symbol" int64 [note: '''| Źródło: [WMS].[dbo].[wms_items].[symbol] | Tabele docelowe: [BQ].[reporting].[dim_products_history].[iai_prod_id] | Czym jest dana kolumna: jest to \'IAI\'owe\' id produktu | Informacje dodatkowe: brak''', ref: < "reporting"."wms_dim_products_history"."iai_id_prod"]
"ean_code" int64 [note: '| Źródło: [WMS].[dbo].[wms_items].[ean_code] | Tabele docelowe: [BQ].[reporting].[dim_products_history].[ean] | Czym jest dana kolumna: jest to kod ean produktu | Informacje dodatkowe: brak', ref: < "reporting"."wms_dim_products_history"."ean"]
"status" string
"dwh_created_at" datetime
"dwh_modified_at" datetime
}
Table "reporting"."wms_dim_products_history" {
"iai_id_prod" int64
"wms_id_prod" int64
"ean" int64
}

1
src/lib/dbml/dbml-export/__tests__/cases/7.json Normal file
View File

File diff suppressed because one or more lines are too long

4
src/lib/dbml/dbml-export/__tests__/export-sql-dbml-cases.test.ts
View File

@@ -74,4 +74,8 @@ describe('DBML Export cases', () => {
testCase('6');
}
);
it('should handle case 7 diagram', { timeout: 30000 }, async () => {
testCase('7');
});
});

109
src/lib/dbml/dbml-export/dbml-export.ts
View File

@@ -218,6 +218,41 @@ export const sanitizeSQLforDBML = (sql: string): string => {
return sanitized;
};
// Find the matching closing bracket, properly handling quoted strings within brackets
const findClosingBracket = (str: string, openBracketIndex: number): number => {
let i = openBracketIndex + 1;
const len = str.length;
while (i < len) {
const char = str[i];
if (char === ']') return i;
// Skip quoted strings (triple, single, or double)
if (char === "'" || char === '"') {
const isTriple =
char === "'" && str[i + 1] === "'" && str[i + 2] === "'";
const quote = isTriple ? "'''" : char;
const quoteLen = quote.length;
i += quoteLen;
while (i < len) {
if (str[i] === '\\') {
i += 2; // Skip escaped char
} else if (str.startsWith(quote, i)) {
i += quoteLen;
break;
} else {
i++;
}
}
continue;
}
i++;
}
return -1;
};
// Post-process DBML to convert separate Ref statements to inline refs
const convertToInlineRefs = (dbml: string): string => {
// Extract all Ref statements - Updated pattern to handle schema.table.field format
@@ -372,59 +407,49 @@ const convertToInlineRefs = (dbml: string): string => {
// 2. Apply all refs to fields
fieldRefs.forEach((fieldData, fieldKey) => {
// fieldKey might be "schema.table.field" or just "table.field"
const lastDotIndex = fieldKey.lastIndexOf('.');
const tableName = fieldKey.substring(0, lastDotIndex);
const fieldName = fieldKey.substring(lastDotIndex + 1);
const tableData = tableMap.get(tableName);
if (tableData) {
// Updated pattern to capture field definition and all existing attributes in brackets
const fieldPattern = new RegExp(
`^([ \t]*"${fieldName}"[^\\n]*?)(?:\\s*(\\[[^\\]]*\\]))*\\s*(//.*)?$`,
'gm'
);
let newContent = tableData.content;
if (!tableData) return;
newContent = newContent.replace(
fieldPattern,
(lineMatch, fieldPart, existingBrackets, commentPart) => {
// Collect all attributes from existing brackets
const allAttributes: string[] = [];
if (existingBrackets) {
// Extract all bracket contents
const bracketPattern = /\[([^\]]*)\]/g;
let bracketMatch;
while (
(bracketMatch = bracketPattern.exec(lineMatch)) !==
null
) {
const content = bracketMatch[1].trim();
if (content) {
allAttributes.push(content);
}
}
}
const fieldStartPattern = new RegExp(`^([ \\t]*)"${fieldName}"\\s+`);
const lines = tableData.content.split('\n');
let modified = false;
// Add all refs for this field
allAttributes.push(...fieldData.refs);
const newLines = lines.map((line) => {
const match = fieldStartPattern.exec(line);
if (!match) return line;
// Combine all attributes into a single bracket
const combinedAttributes = allAttributes.join(', ');
modified = true;
const leadingSpaces = match[1];
const bracketStart = line.indexOf('[');
// Preserve original spacing from fieldPart
const leadingSpaces = fieldPart.match(/^(\s*)/)?.[1] || '';
const fieldDefWithoutSpaces = fieldPart.trim();
// Extract field definition (before bracket) and existing attributes
const fieldDef =
bracketStart !== -1
? line.substring(0, bracketStart).trim()
: line.trim();
return `${leadingSpaces}${fieldDefWithoutSpaces} [${combinedAttributes}]${commentPart || ''}`;
}
);
const existingContent =
bracketStart !== -1
? line.substring(
bracketStart + 1,
findClosingBracket(line, bracketStart)
)
: null;
// Update the table content if modified
if (newContent !== tableData.content) {
tableData.content = newContent;
tableMap.set(tableName, tableData);
}
const attributes = existingContent
? [existingContent.trim(), ...fieldData.refs]
: fieldData.refs;
return `${leadingSpaces}${fieldDef} [${attributes.join(', ')}]`;
});
if (modified) {
tableData.content = newLines.join('\n');
tableMap.set(tableName, tableData);
}
});