Database diagrams editor that allows you to visualize and design your DB with a single query.
TypeScript databasedbdb-migrationeditorerdmariadbmssqlmysqlpostgresqlreactreact-flowschema-migrationssqlsqlitetypescriptvisualizationxyflow
fix: preserve index type (e.g., GIN) during DBML import (#1089)
Jonathan Fishner0e7fa6c75efb
diff --git a/package-lock.json b/package-lock.jsonindex 661c01dd..dd79698e 100644--- a/package-lock.json+++ b/package-lock.json@@ -219,7 +219,6 @@"integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==","dev": true,"license": "MIT",- "peer": true,"dependencies": {"@babel/code-frame": "^7.27.1","@babel/generator": "^7.28.5",@@ -545,6 +544,7 @@"resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz","integrity": "sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==","license": "MIT",+ "peer": true,"dependencies": {"tslib": "^2.0.0"},@@ -3406,7 +3406,8 @@"resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz","integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==","dev": true,- "license": "MIT"+ "license": "MIT",+ "peer": true},"node_modules/@types/babel__core": {"version": "7.20.5",@@ -3587,7 +3588,6 @@"integrity": "sha512-vnDVpYPMzs4wunl27jHrfmwojOGKya0xyM3sH+UE5iv5uPS6vX7UIoh6m+vQc5LGBq52HBKPIn/zcSZVzeDEZg==","dev": true,"license": "MIT",- "peer": true,"dependencies": {"undici-types": "~7.16.0"}@@ -3609,7 +3609,6 @@"resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.27.tgz","integrity": "sha512-cisd7gxkzjBKU2GgdYrTdtQx1SORymWyaAFhaxQPK9bYO9ot3Y5OikQRvY0VYQtvwjeQnizCINJAenh/V7MK2w==","license": "MIT",- "peer": true,"dependencies": {"@types/prop-types": "*","csstype": "^3.2.2"@@ -3621,7 +3620,6 @@"integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==","devOptional": true,"license": "MIT",- "peer": true,"peerDependencies": {"@types/react": "^18.0.0"}@@ -3691,7 +3689,6 @@"integrity": "sha512-6/cmF2piao+f6wSxUsJLZjck7OQsYyRtcOZS02k7XINSNlz93v6emM8WutDQSXnroG2xwYlEVHJI+cPA7CPM3Q==","dev": true,"license": "MIT",- "peer": true,"dependencies": {"@typescript-eslint/scope-manager": "8.50.0","@typescript-eslint/types": "8.50.0",@@ -4071,7 +4068,6 @@"integrity": "sha512-hGISOaP18plkzbWEcP/QvtRW1xDXF2+96HbEX6byqQhAUbiS5oH6/9JwW+QsQCIYON2bI6QZBF+2PvOmrRZ9wA==","dev": true,"license": "MIT",- "peer": true,"dependencies": {"@vitest/utils": "3.2.4","fflate": "^0.8.2",@@ -4147,7 +4143,6 @@"integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==","dev": true,"license": "MIT",- "peer": true,"bin": {"acorn": "bin/acorn"},@@ -4640,7 +4635,6 @@}],"license": "MIT",- "peer": true,"dependencies": {"baseline-browser-mapping": "^2.9.0","caniuse-lite": "^1.0.30001759",@@ -5143,7 +5137,6 @@"resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz","integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==","license": "ISC",- "peer": true,"engines": {"node": ">=12"}@@ -5416,7 +5409,8 @@"resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz","integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==","dev": true,- "license": "MIT"+ "license": "MIT",+ "peer": true},"node_modules/dompurify": {"version": "3.2.7",@@ -5732,7 +5726,6 @@"integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==","dev": true,"license": "MIT",- "peer": true,"dependencies": {"@eslint-community/eslint-utils": "^4.8.0","@eslint-community/regexpp": "^4.12.1",@@ -5793,7 +5786,6 @@"integrity": "sha512-iI1f+D2ViGn+uvv5HuHVUamg8ll4tN+JRHGc6IJi4TP9Kl976C57fzPXgseXNs8v0iA8aSJpHsTWjDb9QJamGQ==","dev": true,"license": "MIT",- "peer": true,"bin": {"eslint-config-prettier": "bin/cli.js"},@@ -6895,7 +6887,6 @@}],"license": "MIT",- "peer": true,"dependencies": {"@babel/runtime": "^7.23.2"}@@ -7534,7 +7525,6 @@"resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz","integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==","license": "MIT",- "peer": true,"bin": {"jiti": "bin/jiti.js"}@@ -7787,6 +7777,7 @@"integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==","dev": true,"license": "MIT",+ "peer": true,"bin": {"lz-string": "bin/bin.js"}@@ -8776,7 +8767,6 @@"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.55.1.tgz","integrity": "sha512-jz4x+TJNFHwHtwuV9vA9rMujcZRb0CEilTEwG2rRSpe/A7Jdkuj8xPKttCgOh+v/lkHy7HsZ64oj+q3xoAFl9A==","license": "MIT",- "peer": true,"dependencies": {"dompurify": "3.2.7","marked": "14.0.0"@@ -9299,7 +9289,6 @@}],"license": "MIT",- "peer": true,"dependencies": {"nanoid": "^3.3.11","picocolors": "^1.1.1",@@ -9491,7 +9480,6 @@"integrity": "sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==","dev": true,"license": "MIT",- "peer": true,"bin": {"prettier": "bin/prettier.cjs"},@@ -9521,6 +9509,7 @@"integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==","dev": true,"license": "MIT",+ "peer": true,"dependencies": {"ansi-regex": "^5.0.1","ansi-styles": "^5.0.0",@@ -9536,6 +9525,7 @@"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==","dev": true,"license": "MIT",+ "peer": true,"engines": {"node": ">=10"},@@ -9605,7 +9595,6 @@"resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz","integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==","license": "MIT",- "peer": true,"dependencies": {"loose-envify": "^1.1.0"},@@ -9618,7 +9607,6 @@"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz","integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==","license": "MIT",- "peer": true,"dependencies": {"loose-envify": "^1.1.0","scheduler": "^0.23.2"@@ -9688,7 +9676,8 @@"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz","integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==","dev": true,- "license": "MIT"+ "license": "MIT",+ "peer": true},"node_modules/react-markdown": {"version": "10.1.0",@@ -10129,7 +10118,6 @@"integrity": "sha512-iTNAbFSlRpcHeeWu73ywU/8KuU/LZmNCSxp6fjQkJBD3ivUb8tpDrXhIxEzA05HlYMEwmtaUnb3RP+YNv162OQ==","dev": true,"license": "MIT",- "peer": true,"dependencies": {"@types/estree": "1.0.8"},@@ -10955,7 +10943,6 @@"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.19.tgz","integrity": "sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==","license": "MIT",- "peer": true,"dependencies": {"@alloc/quick-lru": "^5.2.0","arg": "^5.0.2",@@ -11117,7 +11104,6 @@"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz","integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==","license": "MIT",- "peer": true,"engines": {"node": ">=12"},@@ -11232,8 +11218,7 @@"version": "2.8.1","resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz","integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",- "license": "0BSD",- "peer": true+ "license": "0BSD"},"node_modules/type-check": {"version": "0.4.0",@@ -11332,7 +11317,6 @@"integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==","devOptional": true,"license": "Apache-2.0",- "peer": true,"bin": {"tsc": "bin/tsc","tsserver": "bin/tsserver"@@ -11651,7 +11635,6 @@"integrity": "sha512-dZwN5L1VlUBewiP6H9s2+B3e3Jg96D0vzN+Ry73sOefebhYr9f94wwkMNN/9ouoU8pV1BqA1d1zGk8928cx0rg==","dev": true,"license": "MIT",- "peer": true,"dependencies": {"esbuild": "^0.27.0","fdir": "^6.5.0",@@ -11768,7 +11751,6 @@"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==","dev": true,"license": "MIT",- "peer": true,"engines": {"node": ">=12"},@@ -11782,7 +11764,6 @@"integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==","dev": true,"license": "MIT",- "peer": true,"dependencies": {"@types/chai": "^5.2.2","@vitest/expect": "3.2.4",@@ -12123,7 +12104,6 @@"resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz","integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==","license": "MIT",- "peer": true,"funding": {"url": "https://github.com/sponsors/colinhacks"}diff --git a/src/lib/dbml/dbml-import/dbml-import.ts b/src/lib/dbml/dbml-import/dbml-import.tsindex aa1196cf..af3961b4 100644--- a/src/lib/dbml/dbml-import/dbml-import.ts+++ b/src/lib/dbml/dbml-import/dbml-import.ts@@ -15,7 +15,12 @@ import {import { defaultTableColor } from '@/lib/colors';import { DatabaseType } from '@/lib/domain/database-type';import type Field from '@dbml/core/types/model_structure/field';-import { getTableIndexesWithPrimaryKey, type DBIndex } from '@/lib/domain';+import {+ getTableIndexesWithPrimaryKey,+ type DBIndex,+ type IndexType,+ INDEX_TYPES,+} from '@/lib/domain';import {DBCustomTypeKind,type DBCustomType,@@ -288,6 +293,7 @@ interface DBMLIndex {unique?: boolean;name?: string;pk?: boolean; // Primary key index flag+ type?: string; // Index type (e.g., 'gin', 'btree', 'hash')}interface DBMLTable {@@ -621,6 +627,7 @@ export const importDBMLToDiagram = async (unique: dbmlIndex.unique || false,name: indexName,pk: Boolean(dbmlIndex.pk) || false,+ type: dbmlIndex.type,};}) || [],});@@ -825,6 +832,14 @@ export const importDBMLToDiagram = async (return field.id;});+ const indexType =+ dbmlIndex.type &&+ INDEX_TYPES.includes(+ dbmlIndex.type.toLowerCase() as IndexType+ )+ ? (dbmlIndex.type.toLowerCase() as IndexType)+ : undefined;+return {id: generateId(),name:@@ -833,6 +848,7 @@ export const importDBMLToDiagram = async (fieldIds,unique: dbmlIndex.unique || false,createdAt: Date.now(),+ ...(indexType ? { type: indexType } : {}),};}) || [];