Database diagrams editor that allows you to visualize and design your DB with a single query.
TypeScript databasedbdb-migrationeditorerdmariadbmssqlmysqlpostgresqlreactreact-flowschema-migrationssqlsqlitetypescriptvisualizationxyflow
fix: treat PostgreSQL decimal as synonym for numeric (#1020)
Guy Ben-Aharon4098524b90c1
diff --git a/src/lib/data/data-types/postgres-data-types.ts b/src/lib/data/data-types/postgres-data-types.tsindex 5bf8319b..3c24826f 100644--- a/src/lib/data/data-types/postgres-data-types.ts+++ b/src/lib/data/data-types/postgres-data-types.ts@@ -21,23 +21,23 @@ export const postgresDataTypes: readonly DataTypeData[] = [// Level 2 - Second most common types{ name: 'bigint', id: 'bigint', usageLevel: 2 },// { name: 'int8', id: 'int8', usageLevel: 2 },- {- name: 'decimal',- id: 'decimal',- usageLevel: 2,- fieldAttributes: {- precision: {- max: 131072,- min: 0,- default: 10,- },- scale: {- max: 16383,- min: 0,- default: 2,- },- },- },+ // {+ // name: 'decimal',+ // id: 'decimal',+ // usageLevel: 2,+ // fieldAttributes: {+ // precision: {+ // max: 131072,+ // min: 0,+ // default: 10,+ // },+ // scale: {+ // max: 16383,+ // min: 0,+ // default: 2,+ // },+ // },+ // },{ name: 'serial', id: 'serial', usageLevel: 2 },{ name: 'json', id: 'json', usageLevel: 2 },{ name: 'jsonb', id: 'jsonb', usageLevel: 2 },@@ -53,6 +53,7 @@ export const postgresDataTypes: readonly DataTypeData[] = [{name: 'numeric',id: 'numeric',+ usageLevel: 2,fieldAttributes: {precision: {max: 131072,@@ -171,6 +172,9 @@ const synonymMap: Record<string, string> = {// Bit types'bit varying': 'varbit',++ // Numeric types+ decimal: 'numeric',} as const;/**diff --git a/src/lib/data/sql-export/__tests__/array-fields.test.ts b/src/lib/data/sql-export/__tests__/array-fields.test.tsindex c5d849a2..560af4e2 100644--- a/src/lib/data/sql-export/__tests__/array-fields.test.ts+++ b/src/lib/data/sql-export/__tests__/array-fields.test.ts@@ -142,7 +142,7 @@ describe('SQL Export - Array Fields (Fantasy RPG Theme)', () => {{id: generateId(),name: 'skill_levels',- type: { id: 'decimal', name: 'decimal' },+ type: { id: 'numeric', name: 'numeric' },primaryKey: false,unique: false,nullable: true,@@ -176,7 +176,7 @@ describe('SQL Export - Array Fields (Fantasy RPG Theme)', () => {expect(sql).toContain('CREATE TABLE "game"."heroes"');expect(sql).toContain('"abilities" varchar(100)[]');expect(sql).toContain('"inventory_slots" integer[]');- expect(sql).toContain('"skill_levels" decimal(5, 2)[]');+ expect(sql).toContain('"skill_levels" numeric(5, 2)[]');});it('should export non-array fields normally when isArray is false or undefined', () => {diff --git a/src/lib/dbml/dbml-export/__tests__/dbml-self-referencing.test.ts b/src/lib/dbml/dbml-export/__tests__/dbml-self-referencing.test.tsindex 909fee59..343b1f94 100644--- a/src/lib/dbml/dbml-export/__tests__/dbml-self-referencing.test.ts+++ b/src/lib/dbml/dbml-export/__tests__/dbml-self-referencing.test.ts@@ -4,9 +4,12 @@ import { importDBMLToDiagram } from '../../dbml-import/dbml-import';import { DatabaseType } from '@/lib/domain/database-type';describe('DBML Self-Referencing Relationships', () => {- it('should preserve self-referencing relationships in DBML export', async () => {- // Create a DBML with self-referencing relationship (general_ledger example)- const inputDBML = `+ it(+ 'should preserve self-referencing relationships in DBML export',+ { timeout: 30000 },+ async () => {+ // Create a DBML with self-referencing relationship (general_ledger example)+ const inputDBML = `Table "finance"."general_ledger" {"ledger_id" bigint [pk]"account_name" varchar(100)@@ -16,35 +19,36 @@ Table "finance"."general_ledger" {}`;- // Import the DBML- const diagram = await importDBMLToDiagram(inputDBML, {- databaseType: DatabaseType.POSTGRESQL,- });-- // Verify the relationship was imported- expect(diagram.relationships).toBeDefined();- expect(diagram.relationships?.length).toBe(1);-- // Verify it's a self-referencing relationship- const relationship = diagram.relationships![0];- expect(relationship.sourceTableId).toBe(relationship.targetTableId);-- // Export back to DBML- const exportResult = generateDBMLFromDiagram(diagram);-- // Check inline format- expect(exportResult.inlineDbml).toContain('reversal_id');- // The DBML parser correctly interprets FK as: target < source- expect(exportResult.inlineDbml).toMatch(- /ref:\s*<\s*"finance"\."general_ledger"\."ledger_id"/- );-- // Check standard format- expect(exportResult.standardDbml).toContain('Ref ');- expect(exportResult.standardDbml).toMatch(- /"finance"\."general_ledger"\."ledger_id"\s*<\s*"finance"\."general_ledger"\."reversal_id"/- );- });+ // Import the DBML+ const diagram = await importDBMLToDiagram(inputDBML, {+ databaseType: DatabaseType.POSTGRESQL,+ });++ // Verify the relationship was imported+ expect(diagram.relationships).toBeDefined();+ expect(diagram.relationships?.length).toBe(1);++ // Verify it's a self-referencing relationship+ const relationship = diagram.relationships![0];+ expect(relationship.sourceTableId).toBe(relationship.targetTableId);++ // Export back to DBML+ const exportResult = generateDBMLFromDiagram(diagram);++ // Check inline format+ expect(exportResult.inlineDbml).toContain('reversal_id');+ // The DBML parser correctly interprets FK as: target < source+ expect(exportResult.inlineDbml).toMatch(+ /ref:\s*<\s*"finance"\."general_ledger"\."ledger_id"/+ );++ // Check standard format+ expect(exportResult.standardDbml).toContain('Ref ');+ expect(exportResult.standardDbml).toMatch(+ /"finance"\."general_ledger"\."ledger_id"\s*<\s*"finance"\."general_ledger"\."reversal_id"/+ );+ }+ );it('should handle self-referencing relationships in employee hierarchy', async () => {// Create an employee table with manager relationshipdiff --git a/src/lib/dbml/dbml-import/__tests__/dbml-array-fields.test.ts b/src/lib/dbml/dbml-import/__tests__/dbml-array-fields.test.tsindex fd835956..570b4906 100644--- a/src/lib/dbml/dbml-import/__tests__/dbml-array-fields.test.ts+++ b/src/lib/dbml/dbml-import/__tests__/dbml-array-fields.test.ts@@ -88,7 +88,7 @@ Table "heroes" {(f) => f.name === 'skill_levels');expect(skillLevels?.isArray).toBe(true);- expect(skillLevels?.type.name).toBe('decimal');+ expect(skillLevels?.type.name).toBe('numeric');expect(skillLevels?.precision).toBe(5);expect(skillLevels?.scale).toBe(2);@@ -227,7 +227,7 @@ Table "guilds"."members" {// Verify exported DBML has correct array syntax with typesexpect(exportedDbml).toContain('varchar(50)[]');expect(exportedDbml).toContain('int[]');- expect(exportedDbml).toContain('decimal(3,1)[]');+ expect(exportedDbml).toContain('numeric(3,1)[]');expect(exportedDbml).toContain('text[]');// Re-importdiff --git a/src/lib/dbml/dbml-import/dbml-import.ts b/src/lib/dbml/dbml-import/dbml-import.tsindex ee6f2b6b..f31f73d7 100644--- a/src/lib/dbml/dbml-import/dbml-import.ts+++ b/src/lib/dbml/dbml-import/dbml-import.ts@@ -324,6 +324,12 @@ export const importDBMLToDiagram = async (enums,});+ // Also check the preferred synonym for field attributes (e.g., decimal → numeric)+ const preferredType = options.databaseType+ ? getPreferredSynonym(dataType.name, options.databaseType)+ : null;+ const effectiveType = preferredType ?? dataType;+// Check if this is a character type that should have a max lengthconst baseTypeName = typeName.replace(/\(.*\)/, '')@@ -340,8 +346,8 @@ export const importDBMLToDiagram = async (characterMaximumLength: args[0],};} else if (- dataType.fieldAttributes?.precision &&- dataType.fieldAttributes?.scale+ effectiveType.fieldAttributes?.precision &&+ effectiveType.fieldAttributes?.scale) {const precisionNum = args?.[0] ? parseInt(args[0]) : undefined;const scaleNum = args?.[1] ? parseInt(args[1]) : undefined;