Database diagrams editor that allows you to visualize and design your DB with a single query.
TypeScript databasedbdb-migrationeditorerdmariadbmssqlmysqlpostgresqlreactreact-flowschema-migrationssqlsqlitetypescriptvisualizationxyflow
fix: ddl import of scale and precision (#1031)
Guy Ben-Aharon674ed2249ee4
diff --git a/src/lib/data/sql-import/__tests__/sql-import.test.ts b/src/lib/data/sql-import/__tests__/sql-import.test.tsindex 69998326..73fabaf5 100644--- a/src/lib/data/sql-import/__tests__/sql-import.test.ts+++ b/src/lib/data/sql-import/__tests__/sql-import.test.ts@@ -335,4 +335,79 @@ CREATE TABLE playlists (expect(relationship?.targetFieldId).toBe(playlistUserIdField?.id);expect(relationship?.targetCardinality).toBe('many');});++ it('should parse PostgreSQL table with schema, decimal types, and various column types', async () => {+ const sql = `+ CREATE TABLE "inventory"."order_summary" (+ "order_id" SERIAL PRIMARY KEY,+ "customer_id" int,+ "product_id" int,+ "batch_id" int,+ "order_date" date,+ "total_amount" decimal(15,2),+ "discount_amount" decimal(15,2),+ "items_count" int,+ "units_sold" int+ );+ `;++ const diagram = await sqlImportToDiagram({+ sqlContent: sql,+ sourceDatabaseType: DatabaseType.POSTGRESQL,+ targetDatabaseType: DatabaseType.POSTGRESQL,+ });++ // Verify diagram structure+ expect(diagram).toBeDefined();+ expect(diagram.databaseType).toBe(DatabaseType.POSTGRESQL);++ // Verify table was parsed+ expect(diagram.tables).toHaveLength(1);+ const table = diagram.tables?.[0];+ expect(table?.name).toBe('order_summary');+ expect(table?.schema).toBe('inventory');++ // Verify all fields were parsed+ const fields = table?.fields;+ expect(fields).toHaveLength(9);++ const fieldNames = fields?.map((f) => f.name);+ expect(fieldNames).toContain('order_id');+ expect(fieldNames).toContain('customer_id');+ expect(fieldNames).toContain('product_id');+ expect(fieldNames).toContain('batch_id');+ expect(fieldNames).toContain('order_date');+ expect(fieldNames).toContain('total_amount');+ expect(fieldNames).toContain('discount_amount');+ expect(fieldNames).toContain('items_count');+ expect(fieldNames).toContain('units_sold');++ // Verify primary key+ const pkField = fields?.find((f) => f.name === 'order_id');+ expect(pkField?.primaryKey).toBe(true);+ expect(pkField?.type.name).toBe('int');++ // Verify decimal fields (decimal is normalized to numeric in PostgreSQL)+ const totalAmountField = fields?.find((f) => f.name === 'total_amount');+ expect(totalAmountField?.type.name).toBe('numeric');+ expect(totalAmountField?.type.id).toBe('numeric');+ expect(totalAmountField?.precision).toBe(15);+ expect(totalAmountField?.scale).toBe(2);++ const discountAmountField = fields?.find(+ (f) => f.name === 'discount_amount'+ );+ expect(discountAmountField?.type.name).toBe('numeric');+ expect(discountAmountField?.type.id).toBe('numeric');+ expect(discountAmountField?.precision).toBe(15);+ expect(discountAmountField?.scale).toBe(2);++ // Verify date field+ const orderDateField = fields?.find((f) => f.name === 'order_date');+ expect(orderDateField?.type.name).toBe('date');++ // Verify int fields+ const customerIdField = fields?.find((f) => f.name === 'customer_id');+ expect(customerIdField?.type.name).toBe('int');+ });});diff --git a/src/lib/data/sql-import/dialect-importers/postgresql/postgresql-common.ts b/src/lib/data/sql-import/dialect-importers/postgresql/postgresql-common.tsindex 574ad920..14ddd586 100644--- a/src/lib/data/sql-import/dialect-importers/postgresql/postgresql-common.ts+++ b/src/lib/data/sql-import/dialect-importers/postgresql/postgresql-common.ts@@ -198,13 +198,17 @@ export function getTypeArgs(if (!definition) return typeArgs;- if (definition.length !== undefined) {- typeArgs.length = definition.length;- }-- if (definition.scale !== undefined && definition.precision !== undefined) {- typeArgs.precision = definition.precision;+ // node-sql-parser stores precision as 'length' for DECIMAL/NUMERIC types+ // Check if scale is present to determine if this is a numeric type with precision+ if (definition.scale !== undefined) {+ // When scale exists, length represents precision (for DECIMAL/NUMERIC)+ // or precision property is directly available+ typeArgs.precision = definition.precision ?? definition.length;typeArgs.scale = definition.scale;+ } else if (definition.precision !== undefined) {+ typeArgs.precision = definition.precision;+ } else if (definition.length !== undefined) {+ typeArgs.length = definition.length;}return typeArgs;diff --git a/src/lib/data/sql-import/dialect-importers/postgresql/postgresql.ts b/src/lib/data/sql-import/dialect-importers/postgresql/postgresql.tsindex 686f95de..664e400d 100644--- a/src/lib/data/sql-import/dialect-importers/postgresql/postgresql.ts+++ b/src/lib/data/sql-import/dialect-importers/postgresql/postgresql.ts@@ -923,6 +923,12 @@ export async function fromPostgres(} else {finalDataType = `${normalizedBaseType}(${precision})`;}+ } else if (+ scale !== undefined &&+ length !== undefined+ ) {+ // For DECIMAL/NUMERIC, node-sql-parser stores precision as 'length'+ finalDataType = `${normalizedBaseType}(${length},${scale})`;} else if (length !== undefined &&length !== null