Skip to content

Database diagrams editor that allows you to visualize and design your DB with a single query.

fix: quote bare string defaults in DBML export sanitization (#1091)

Jonathan Fishner9fe272205952
diff --git a/src/lib/dbml/dbml-export/__tests__/dbml-export-sanitization.test.ts b/src/lib/dbml/dbml-export/__tests__/dbml-export-sanitization.test.ts
index d01eeea5..cac8eaf7 100644
--- a/src/lib/dbml/dbml-export/__tests__/dbml-export-sanitization.test.ts
+++ b/src/lib/dbml/dbml-export/__tests__/dbml-export-sanitization.test.ts
@@ -52,11 +52,28 @@ describe('DBML SQL Sanitization - Fantasy Examples', () => {
const sanitized = sanitizeSQLforDBML(sql);
- // Should convert both NOW and now to NOW()
- expect(sanitized.match(/DEFAULT NOW\(\)/gi)?.length).toBe(2); // cast_at becomes NOW(), created_at already has NOW()
+ // Should convert all three: NOW -> NOW(), now -> NOW(), NOW() stays NOW()
+ expect(sanitized.match(/DEFAULT NOW\(\)/gi)?.length).toBe(3);
expect(sanitized).not.toMatch(/DEFAULT NOW(?!\()/i);
});
+ it('should quote lowercase and mixed-case bare identifier defaults', () => {
+ const sql = `CREATE TABLE users (
+ id uuid PRIMARY KEY,
+ status varchar(20) DEFAULT active,
+ permission varchar(20) DEFAULT all,
+ role varchar(20) DEFAULT member,
+ tier varchar(20) DEFAULT Basic
+);`;
+
+ const sanitized = sanitizeSQLforDBML(sql);
+
+ expect(sanitized).toContain("DEFAULT 'active'");
+ expect(sanitized).toContain("DEFAULT 'all'");
+ expect(sanitized).toContain("DEFAULT 'member'");
+ expect(sanitized).toContain("DEFAULT 'Basic'");
+ });
+
it('should not affect other DEFAULT values', () => {
const sql = `CREATE TABLE potion_inventory (
id uuid PRIMARY KEY,
@@ -230,7 +247,7 @@ CREATE TABLE public.account_users (
expect(sanitized).not.toContain('char (3)');
expect(sanitized).toContain("DEFAULT 'EUR'");
expect(sanitized).not.toContain('DEFAULT EUR');
- expect(sanitized).toContain("DEFAULT 'NOW'"); // NOW is quoted in this case
+ expect(sanitized).toContain('DEFAULT NOW()'); // NOW is preserved then converted to NOW()
expect(sanitized).not.toContain('DEFAULT NOW,');
// The composite primary key issue isn't fixed by sanitization
@@ -265,7 +282,7 @@ ALTER TABLE spell_component_links ADD CONSTRAINT fk_creator FOREIGN KEY (link_id
expect(sanitized).toContain('char(64)');
expect(sanitized).toContain('char(1)');
expect(sanitized).toContain("DEFAULT 'F'");
- expect(sanitized).toContain("DEFAULT 'NOW'"); // NOW is quoted as a single word
+ expect(sanitized).toContain('DEFAULT NOW()'); // NOW is preserved then converted to NOW()
expect(sanitized).toContain('(matrix_pattern)'); // Deduplicated
// Valid self-referencing relationships (different fields) are preserved
expect(sanitized).toContain(
@@ -280,7 +297,7 @@ ALTER TABLE spell_component_links ADD CONSTRAINT fk_creator FOREIGN KEY (link_id
expect(sanitized).toContain(
'ADD CONSTRAINT fk_creator_1 FOREIGN KEY'
);
- expect(sanitized).toContain('DEFAULT has default'); // This should be handled by export function
+ expect(sanitized).toContain("DEFAULT 'has'"); // 'has' gets quoted as a bare identifier
});
});
});
diff --git a/src/lib/dbml/dbml-export/dbml-export.ts b/src/lib/dbml/dbml-export/dbml-export.ts
index fb3495f0..86a04094 100644
--- a/src/lib/dbml/dbml-export/dbml-export.ts
+++ b/src/lib/dbml/dbml-export/dbml-export.ts
@@ -200,19 +200,35 @@ export const sanitizeSQLforDBML = (sql: string): string => {
sanitized = sanitized.replace(/char\s+\(/g, 'char(');
sanitized = sanitized.replace(/character\s+\(/g, 'character(');
- // Fix DEFAULT EUR and similar cases by quoting them
+ // Fix bare identifier defaults (e.g., DEFAULT EUR, DEFAULT active, DEFAULT all)
+ // by quoting them as string literals, while preserving SQL keywords/functions
+ const sqlDefaultKeywords = new Set([
+ 'TRUE',
+ 'FALSE',
+ 'NULL',
+ 'CURRENT_TIMESTAMP',
+ 'CURRENT_DATE',
+ 'CURRENT_TIME',
+ 'NOW',
+ 'GETDATE',
+ 'NEWID',
+ 'UUID',
+ ]);
sanitized = sanitized.replace(
- /DEFAULT\s+([A-Z]{3})(?=\s|,|$)/g,
- "DEFAULT '$1'"
- );
- // Also handle single letter defaults
- sanitized = sanitized.replace(
- /DEFAULT\s+([A-Z])(?=\s|,|$)/g,
- "DEFAULT '$1'"
+ /DEFAULT\s+([a-zA-Z_]\w*)(?=[\s,);]|$)/gi,
+ (match, identifier) => {
+ if (sqlDefaultKeywords.has(identifier.toUpperCase())) {
+ return match;
+ }
+ return `DEFAULT '${identifier}'`;
+ }
);
// Fix DEFAULT NOW by replacing with NOW()
- sanitized = sanitized.replace(/DEFAULT\s+NOW(?=\s|,|$)/gi, 'DEFAULT NOW()');
+ sanitized = sanitized.replace(
+ /DEFAULT\s+NOW(?=[\s,);]|$)/gi,
+ 'DEFAULT NOW()'
+ );
// Replace any remaining problematic characters
sanitized = sanitized.replace(/\?\?/g, '__');