Free, simple, and intuitive online database diagram editor and SQL generator.
JavaScript databasedatabase-designdatabase-diagramdatabase-schemadbmldiagram-editoreditorer-diagramerderdiagramindexeddbmariadbmcporacle-databaseoracle-dbpostgresqlschema-designsqlsql-serversqlite
Add composite foreign keys (#1048)
1ilit1f7b11286b66
diff --git a/src/components/EditorCanvas/Canvas.jsx b/src/components/EditorCanvas/Canvas.jsxindex fb49f217..f94aa394 100644--- a/src/components/EditorCanvas/Canvas.jsx+++ b/src/components/EditorCanvas/Canvas.jsx@@ -657,6 +657,12 @@ export default function Canvas() {cardinality,endTableId: hoveredTable.tableId,endFieldId: hoveredTable.fieldId,+ fields: [+ {+ startFieldId: linkingLine.startFieldId,+ endFieldId: hoveredTable.fieldId,+ },+ ],updateConstraint: Constraint.NONE,deleteConstraint: Constraint.NONE,name: `fk_${startTableName}_${startField.name}_${endTableName}`,diff --git a/src/components/EditorCanvas/Relationship.jsx b/src/components/EditorCanvas/Relationship.jsxindex a19fd1e2..ddc227d9 100644--- a/src/components/EditorCanvas/Relationship.jsx+++ b/src/components/EditorCanvas/Relationship.jsx@@ -1,11 +1,15 @@import { useMemo, useRef, useState, useEffect } from "react";import { Cardinality, ObjectType, Tab } from "../../data/constants";-import { calcPath } from "../../utils/calcPath";+import { calcPath, calcCompositePath } from "../../utils/calcPath";import { useDiagram, useSettings, useLayout, useSelect } from "../../hooks";import { useTranslation } from "react-i18next";import { SideSheet } from "@douyinfe/semi-ui";import RelationshipInfo from "../EditorSidePanel/RelationshipsTab/RelationshipInfo";-import { getVisibleFieldIndex, getVisibleFields } from "../../utils/utils";+import {+ getVisibleFieldIndex,+ getVisibleFields,+ getRelationshipFields,+} from "../../utils/utils";const labelFontSize = 16;@@ -26,6 +30,8 @@ export default function Relationship({ data }) {const startFields = getVisibleFields(startTable, relationships);const endFields = getVisibleFields(endTable, relationships);+ const pairs = getRelationshipFields(data);+return {startFieldIndex: getVisibleFieldIndex(startTable,@@ -37,6 +43,12 @@ export default function Relationship({ data }) {data.endFieldId,relationships,),+ startFieldIndices: pairs.map((p) =>+ getVisibleFieldIndex(startTable, p.startFieldId, relationships),+ ),+ endFieldIndices: pairs.map((p) =>+ getVisibleFieldIndex(endTable, p.endFieldId, relationships),+ ),startTable: {x: startTable.x,y: startTable.y,@@ -52,6 +64,23 @@ export default function Relationship({ data }) {};}, [tables, relationships, data]);+ const isComposite = (pathValues?.startFieldIndices?.length ?? 0) > 1;++ const composite = useMemo(() => {+ if (!pathValues || !isComposite) return null;+ return calcCompositePath(+ {+ startTable: pathValues.startTable,+ endTable: pathValues.endTable,+ startFieldIndices: pathValues.startFieldIndices,+ endFieldIndices: pathValues.endFieldIndices,+ },+ settings.tableWidth,+ 1,+ settings.showComments,+ );+ }, [pathValues, isComposite, settings.tableWidth, settings.showComments]);+const pathRef = useRef();const labelRef = useRef();@@ -91,7 +120,14 @@ export default function Relationship({ data }) {const cardinalityOffset = 28;- if (pathRef.current) {+ if (composite) {+ labelX = composite.labelPoint.x - (labelWidth ?? 0) / 2;+ labelY = composite.labelPoint.y + (labelHeight ?? 0) / 2;+ cardinalityStartX = composite.startCardinality.x;+ cardinalityStartY = composite.startCardinality.y;+ cardinalityEndX = composite.endCardinality.x;+ cardinalityEndY = composite.endCardinality.y;+ } else if (pathRef.current) {const pathLength = pathRef.current.getTotalLength();const labelPoint = pathRef.current.getPointAtLength(pathLength / 2);@@ -138,12 +174,16 @@ export default function Relationship({ data }) {<g className="select-none group" onDoubleClick={edit}>{/* invisible wider path for better hover ux */}<path- d={calcPath(- pathValues,- settings.tableWidth,- 1,- settings.showComments,- )}+ d={+ composite+ ? composite.path+ : calcPath(+ pathValues,+ settings.tableWidth,+ 1,+ settings.showComments,+ )+ }fill="none"stroke="transparent"strokeWidth={12}@@ -151,12 +191,16 @@ export default function Relationship({ data }) {/><pathref={pathRef}- d={calcPath(- pathValues,- settings.tableWidth,- 1,- settings.showComments,- )}+ d={+ composite+ ? composite.path+ : calcPath(+ pathValues,+ settings.tableWidth,+ 1,+ settings.showComments,+ )+ }className="relationship-path"fill="none"cursor="pointer"@@ -174,7 +218,7 @@ export default function Relationship({ data }) {{data.name}</text>)}- {pathRef.current && settings.showCardinality && (+ {(composite || pathRef.current) && settings.showCardinality && (<><CardinalityLabelx={cardinalityStartX}diff --git a/src/components/EditorCanvas/Table.jsx b/src/components/EditorCanvas/Table.jsxindex ceb053ef..7c825602 100644--- a/src/components/EditorCanvas/Table.jsx+++ b/src/components/EditorCanvas/Table.jsx@@ -45,6 +45,7 @@ import {getTableHeight,getVisibleFieldEntries,getVisibleFields,+ getRelationshipFields,} from "../../utils/utils";export default function Table({@@ -214,14 +215,20 @@ export default function Table({};const getFieldReference = (fieldData) => {- const rel = relationships.find(- (r) =>- r.startTableId === tableData.id && r.startFieldId === fieldData.id,- );+ let matchedEndFieldId = null;+ const rel = relationships.find((r) => {+ if (r.startTableId !== tableData.id) return false;+ const pair = getRelationshipFields(r).find(+ (p) => p.startFieldId === fieldData.id,+ );+ if (!pair) return false;+ matchedEndFieldId = pair.endFieldId;+ return true;+ });if (!rel) return null;const refTable = tables.find((tbl) => tbl.id === rel.endTableId);- const refField = refTable?.fields.find((f) => f.id === rel.endFieldId);+ const refField = refTable?.fields.find((f) => f.id === matchedEndFieldId);if (!refTable || !refField) return null;return { tableName: refTable.name, fieldName: refField.name };diff --git a/src/components/EditorSidePanel/RelationshipsTab/RelationshipInfo.jsx b/src/components/EditorSidePanel/RelationshipsTab/RelationshipInfo.jsxindex fc42ae13..095c92bf 100644--- a/src/components/EditorSidePanel/RelationshipsTab/RelationshipInfo.jsx+++ b/src/components/EditorSidePanel/RelationshipsTab/RelationshipInfo.jsx@@ -3,14 +3,14 @@ import {Col,Select,Button,- Popover,- Table,Input,+ Collapse,+ Card,} from "@douyinfe/semi-ui";import {+ IconClose,IconDeleteStroked,- IconLoopTextStroked,- IconMore,+ IconPlus,} from "@douyinfe/semi-icons";import {Cardinality,@@ -19,21 +19,10 @@ import {ObjectType,} from "../../../data/constants";import { useDiagram, useLayout, useUndoRedo } from "../../../hooks";-import i18n from "../../../i18n/i18n";+import { getRelationshipFields } from "../../../utils/utils";import { useTranslation } from "react-i18next";import { useMemo, useState } from "react";-const columns = [- {- title: i18n.t("primary"),- dataIndex: "primary",- },- {- title: i18n.t("foreign"),- dataIndex: "foreign",- },-];-export default function RelationshipInfo({ data }) {const { setUndoStack, setRedoStack } = useUndoRedo();const { tables, deleteRelationship, updateRelationship } = useDiagram();@@ -41,28 +30,106 @@ export default function RelationshipInfo({ data }) {const { layout } = useLayout();const [editField, setEditField] = useState({});- const relValues = useMemo(() => {- const { fields: startTableFields, name: startTableName } = tables.find(- (t) => t.id === data.startTableId,- );- const { name: startFieldName } = startTableFields.find(- (f) => f.id === data.startFieldId,- );- const { fields: endTableFields, name: endTableName } = tables.find(- (t) => t.id === data.endTableId,- );- const { name: endFieldName } = endTableFields.find(- (f) => f.id === data.endFieldId,- );- return {- startTableName,- startFieldName,- endTableName,- endFieldName,+ const startTable = useMemo(+ () => tables.find((tb) => tb.id === data.startTableId),+ [tables, data.startTableId],+ );+ const endTable = useMemo(+ () => tables.find((tb) => tb.id === data.endTableId),+ [tables, data.endTableId],+ );++ const pairs = useMemo(() => getRelationshipFields(data), [data]);++ const startTableName = startTable?.name ?? "";+ const endTableName = endTable?.name ?? "";++ const startFieldOptions = (startTable?.fields ?? []).map((f) => ({+ label: f.name,+ value: f.id,+ }));+ const endFieldOptions = (endTable?.fields ?? []).map((f) => ({+ label: f.name,+ value: f.id,+ }));++ const maxPairs = Math.min(+ startTable?.fields?.length ?? 0,+ endTable?.fields?.length ?? 0,+ );++ const commitPairs = (newPairs, extra = "[fields]") => {+ if (layout.readOnly) return;+ const undo = {+ fields: pairs.map((p) => ({ ...p })),+ startFieldId: data.startFieldId,+ endFieldId: data.endFieldId,};- }, [tables, data]);+ const redo = {+ fields: newPairs.map((p) => ({ ...p })),+ startFieldId: newPairs[0].startFieldId,+ endFieldId: newPairs[0].endFieldId,+ };+ setUndoStack((prev) => [+ ...prev,+ {+ action: Action.EDIT,+ element: ObjectType.RELATIONSHIP,+ rid: data.id,+ undo,+ redo,+ message: t("edit_relationship", {+ refName: data.name,+ extra,+ }),+ },+ ]);+ setRedoStack([]);+ updateRelationship(data.id, redo);+ };++ const changePairField = (index, side, value) => {+ const newPairs = pairs.map((p, i) =>+ i === index ? { ...p, [`${side}FieldId`]: value } : { ...p },+ );+ commitPairs(newPairs);+ };++ const addPair = () => {+ const newPairs = [+ ...pairs.map((p) => ({ ...p })),+ {+ startFieldId: startTable?.fields?.[0]?.id,+ endFieldId: endTable?.fields?.[0]?.id,+ },+ ];+ commitPairs(newPairs, "[add field]");+ };++ const removePair = (index) => {+ if (pairs.length <= 1) return;+ const newPairs = pairs+ .filter((_, i) => i !== index)+ .map((p) => ({ ...p }));+ commitPairs(newPairs, "[remove field]");+ };const swapKeys = () => {+ if (layout.readOnly) return;+ const swappedPairs = pairs.map((p) => ({+ startFieldId: p.endFieldId,+ endFieldId: p.startFieldId,+ }));+ const redo = {+ name: `fk_${endTableName}_${+ endTable?.fields?.find((f) => f.id === data.endFieldId)?.name ?? ""+ }_${startTableName}`,+ startTableId: data.endTableId,+ endTableId: data.startTableId,+ fields: swappedPairs,+ startFieldId: swappedPairs[0].startFieldId,+ endFieldId: swappedPairs[0].endFieldId,+ };setUndoStack((prev) => [...prev,{@@ -70,17 +137,14 @@ export default function RelationshipInfo({ data }) {element: ObjectType.RELATIONSHIP,rid: data.id,undo: {+ name: data.name,startTableId: data.startTableId,- startFieldId: data.startFieldId,endTableId: data.endTableId,+ fields: pairs.map((p) => ({ ...p })),+ startFieldId: data.startFieldId,endFieldId: data.endFieldId,},- redo: {- startTableId: data.endTableId,- startFieldId: data.endFieldId,- endTableId: data.startTableId,- endFieldId: data.startFieldId,- },+ redo,message: t("edit_relationship", {refName: data.name,extra: "[swap keys]",@@ -88,14 +152,7 @@ export default function RelationshipInfo({ data }) {},]);setRedoStack([]);-- updateRelationship(data.id, {- name: `fk_${relValues.endTableName}_${relValues.endFieldName}_${relValues.startTableName}`,- startTableId: data.endTableId,- startFieldId: data.endFieldId,- endTableId: data.startTableId,- endFieldId: data.startFieldId,- });+ updateRelationship(data.id, redo);};const changeCardinality = (value) => {@@ -174,52 +231,25 @@ export default function RelationshipInfo({ data }) {}}/></div>- <div className="flex justify-between items-center mb-3">+ <div className="flex justify-between items-center mb-1"><div className="me-3"><span className="font-semibold">{t("primary")}: </span>- {relValues.endTableName}+ {endTableName}</div><div className="mx-1"><span className="font-semibold">{t("foreign")}: </span>- {relValues.startTableName}- </div>- <div className="ms-1">- <Popover- content={- <div className="p-2 popover-theme">- <Table- columns={columns}- dataSource={[- {- key: "1",- foreign: `${relValues.startTableName}(${relValues.startFieldName})`,- primary: `${relValues.endTableName}(${relValues.endFieldName})`,- },- ]}- pagination={false}- size="small"- bordered- />- <div className="mt-2">- <Button- block- icon={<IconLoopTextStroked />}- onClick={swapKeys}- disabled={layout.readOnly}- >- {t("swap")}- </Button>- </div>- </div>- }- trigger="click"- position="rightTop"- showArrow- >- <Button icon={<IconMore />} type="tertiary" />- </Popover>+ {startTableName}</div>+ <Button+ icon={<i className="bi bi-arrow-left-right" />}+ type="tertiary"+ size="small"+ onClick={swapKeys}+ disabled={layout.readOnly}+ title={t("swap")}+ /></div>+<div className="font-semibold my-1">{t("cardinality")}:</div><SelectoptionList={Object.values(Cardinality).map((v) => ({@@ -291,6 +321,72 @@ export default function RelationshipInfo({ data }) {/></Col></Row>+ <Card+ bodyStyle={{ padding: "4px" }}+ style={{ marginTop: "12px", marginBottom: "12px" }}+ headerLine={false}+ >+ <Collapse keepDOM={false} lazyRender accordion>+ <Collapse.Panel header={t("composite_key")} itemKey="1">+ <div className="pb-4">+ <div className="text-color opacity-70 mb-3">+ {t("composite_key_hint")}+ </div>+ <div className="grid grid-cols-[1fr_1fr_32px] gap-2 items-center mb-2">+ <div className="text-xs font-semibold text-color">+ {t("foreign")}+ </div>+ <div className="text-xs font-semibold text-color">+ {t("primary")}+ </div>+ <div />+ </div>+ {pairs.map((pair, i) => (+ <div+ key={i}+ className="grid grid-cols-[1fr_1fr_32px] gap-2 items-center mb-2.5"+ >+ <Select+ optionList={startFieldOptions}+ value={pair.startFieldId}+ className="w-full"+ disabled={layout.readOnly}+ onChange={(value) => changePairField(i, "start", value)}+ />+ <Select+ optionList={endFieldOptions}+ value={pair.endFieldId}+ className="w-full"+ disabled={layout.readOnly}+ onChange={(value) => changePairField(i, "end", value)}+ />+ <Button+ icon={+ <IconClose+ size="small"+ style={{ color: "var(--semi-color-danger)" }}+ />+ }+ type="tertiary"+ disabled={layout.readOnly || pairs.length <= 1}+ onClick={() => removePair(i)}+ />+ </div>+ ))}+ <Button+ block+ icon={<IconPlus />}+ onClick={addPair}+ disabled={layout.readOnly || pairs.length >= maxPairs}+ className="mt-1"+ >+ {t("add_field")}+ </Button>+ </div>+ </Collapse.Panel>+ </Collapse>+ </Card>+<Buttonblocktype="danger"diff --git a/src/components/EditorSidePanel/TablesTab/TableInfo.jsx b/src/components/EditorSidePanel/TablesTab/TableInfo.jsxindex 27166bce..c02a73ce 100644--- a/src/components/EditorSidePanel/TablesTab/TableInfo.jsx+++ b/src/components/EditorSidePanel/TablesTab/TableInfo.jsx@@ -352,7 +352,7 @@ export default function TableInfo({ data }) {</Card>)}- <div className="flex justify-between items-center gap-1 mb-2">+ <div className="flex justify-between items-center gap-1 mt-5 mb-2"><ColorPickerusePopover={true}readOnly={layout.readOnly}diff --git a/src/context/DiagramContext.jsx b/src/context/DiagramContext.jsxindex 61488f5f..6eac27fe 100644--- a/src/context/DiagramContext.jsx+++ b/src/context/DiagramContext.jsx@@ -4,6 +4,7 @@ import { useTransform, useUndoRedo, useSelect, useCollab } from "../hooks";import { Toast } from "@douyinfe/semi-ui";import { useTranslation } from "react-i18next";import { nanoid } from "nanoid";+import { getRelationshipFields } from "../utils/utils";export const DiagramContext = createContext(null);@@ -183,12 +184,15 @@ export default function DiagramContextProvider({ children }) {const deleteField = (field, tid, addToHistory = true) => {const { fields, name } = tables.find((t) => t.id === tid);+ const referencesField = (r) =>+ getRelationshipFields(r).some(+ (p) =>+ (r.startTableId === tid && p.startFieldId === field.id) ||+ (r.endTableId === tid && p.endFieldId === field.id),+ );if (addToHistory) {const rels = relationships.reduce((acc, r) => {- if (- (r.startTableId === tid && r.startFieldId === field.id) ||- (r.endTableId === tid && r.endFieldId === field.id)- ) {+ if (referencesField(r)) {acc.push(r);}return acc;@@ -213,15 +217,7 @@ export default function DiagramContextProvider({ children }) {]);setRedoStack([]);}- setRelationships((prev) =>- prev.filter(- (e) =>- !(- (e.startTableId === tid && e.startFieldId === field.id) ||- (e.endTableId === tid && e.endFieldId === field.id)- ),- ),- );+ setRelationships((prev) => prev.filter((e) => !referencesField(e)));updateTable(tid, {fields: fields.filter((e) => e.id !== field.id),});diff --git a/src/i18n/locales/en.js b/src/i18n/locales/en.jsindex f0930657..cbf79c07 100644--- a/src/i18n/locales/en.js+++ b/src/i18n/locales/en.js@@ -130,6 +130,8 @@ const en = {add: "Add",add_comment: "Add comment",add_field: "Add field",+ composite_key: "Composite key",+ composite_key_hint: "Add fields to make a composite key.",values: "Values",size: "Size",precision: "Precision",diff --git a/src/utils/calcPath.js b/src/utils/calcPath.jsindex f524d79e..f7be3195 100644--- a/src/utils/calcPath.js+++ b/src/utils/calcPath.js@@ -124,3 +124,111 @@ export function calcPath(r, tableWidth = 200, zoom = 1, showComments = true) {}}}++/**+ * Builds a "fork" path for a composite (multi-column) foreign key: a short+ * stub from every column on each table converges to a vertical collector,+ * the two collectors are joined by a single orthogonal trunk, and the trunk+ * forks back out to the columns on the other table.+ *+ * @param {{+ * startTable: { x: number, y: number, comment?: string, fields?: any[] },+ * endTable: { x: number, y: number, comment?: string, fields?: any[] },+ * startFieldIndices: number[],+ * endFieldIndices: number[],+ * }} r+ * @returns {{+ * path: string,+ * labelPoint: { x: number, y: number },+ * startCardinality: { x: number, y: number },+ * endCardinality: { x: number, y: number },+ * } | null}+ */+export function calcCompositePath(+ r,+ tableWidth = 200,+ zoom = 1,+ showComments = true,+) {+ if (!r || !r.startFieldIndices?.length || !r.endFieldIndices?.length) {+ return null;+ }++ const width = tableWidth * zoom;+ const anchorY = (table, index) =>+ table.y ++ tableHeaderHeight ++ getCommentHeight(table.comment, tableWidth, showComments) ++ getFieldOffsetY(table.fields ?? [], index, tableWidth, showComments) ++ tableFieldHeight / 2;++ const startYs = r.startFieldIndices.map((i) => anchorY(r.startTable, i));+ const endYs = r.endFieldIndices.map((i) => anchorY(r.endTable, i));++ // Connect each table on the edge facing the other table.+ const startCenter = r.startTable.x + width / 2;+ const endCenter = r.endTable.x + width / 2;+ const startIsLeft = startCenter <= endCenter;+ const startX = startIsLeft ? r.startTable.x + width : r.startTable.x;+ const endX = startIsLeft ? r.endTable.x : r.endTable.x + width;+ const dir = startIsLeft ? 1 : -1;+ const fork = 24 * zoom;+ const mergeStartX = startX + dir * fork;+ const mergeEndX = endX - dir * fork;++ const minS = Math.min(...startYs);+ const maxS = Math.max(...startYs);+ const minE = Math.min(...endYs);+ const maxE = Math.max(...endYs);+ const trunkStartY = (minS + maxS) / 2;+ const trunkEndY = (minE + maxE) / 2;+ const midX = (mergeStartX + mergeEndX) / 2;++ const radius = 10 * zoom;++ // A column branch: horizontal stub from the table edge to the collector x,+ // a rounded corner, then a vertical run down to the trunk level. Branches+ // overlap on the collector x, reading as a single fork that converges into+ // the trunk.+ const branch = (fromX, fromY, cornerX, toY) => {+ if (Math.abs(fromY - toY) < 0.5) {+ return `M ${fromX} ${fromY} L ${cornerX} ${toY}`;+ }+ const dx = Math.sign(cornerX - fromX);+ const dy = Math.sign(toY - fromY);+ const r = Math.min(radius, Math.abs(toY - fromY), Math.abs(cornerX - fromX));+ return `M ${fromX} ${fromY} L ${cornerX - dx * r} ${fromY} Q ${cornerX} ${fromY} ${cornerX} ${fromY + dy * r} L ${cornerX} ${toY}`;+ };++ // The trunk: a rounded orthogonal connector between the two collectors.+ const trunk = (sx, sy, ex, ey) => {+ if (Math.abs(sy - ey) < 0.5) {+ return `M ${sx} ${sy} L ${ex} ${ey}`;+ }+ const mx = (sx + ex) / 2;+ const dxs = Math.sign(mx - sx);+ const dxe = Math.sign(ex - mx);+ const dy = Math.sign(ey - sy);+ const r = Math.min(+ radius,+ Math.abs(ey - sy) / 2,+ Math.abs(mx - sx) || radius,+ );+ return `M ${sx} ${sy} L ${mx - dxs * r} ${sy} Q ${mx} ${sy} ${mx} ${sy + dy * r} L ${mx} ${ey - dy * r} Q ${mx} ${ey} ${mx + dxe * r} ${ey} L ${ex} ${ey}`;+ };++ const segs = [];+ // Each start column forks into the trunk.+ startYs.forEach((y) => segs.push(branch(startX, y, mergeStartX, trunkStartY)));+ // Single trunk between the two collectors.+ segs.push(trunk(mergeStartX, trunkStartY, mergeEndX, trunkEndY));+ // Each end column forks out of the trunk.+ endYs.forEach((y) => segs.push(branch(endX, y, mergeEndX, trunkEndY)));++ return {+ path: segs.join(" "),+ labelPoint: { x: midX, y: (trunkStartY + trunkEndY) / 2 },+ startCardinality: { x: mergeStartX, y: trunkStartY },+ endCardinality: { x: mergeEndX, y: trunkEndY },+ };+}diff --git a/src/utils/exportAs/dbml.js b/src/utils/exportAs/dbml.jsindex a99ae3a1..beb9dc25 100644--- a/src/utils/exportAs/dbml.js+++ b/src/utils/exportAs/dbml.js@@ -2,7 +2,7 @@ import { Cardinality } from "../../data/constants";import { dbToTypes } from "../../data/datatypes";import i18n from "../../i18n/i18n";import { escapeQuotes } from "../exportSQL/shared";-import { isFunction, isKeyword } from "../utils";+import { isFunction, isKeyword, getRelationshipFields } from "../utils";const IDENT_SAFE_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;@@ -108,20 +108,28 @@ function processType(type) {}export function toDBML(diagram) {+ const columnRef = (tableName, fieldNames) => {+ const cols = fieldNames.map((n) => quoteIdentifier(n));+ const colPart = cols.length === 1 ? cols[0] : `(${cols.join(", ")})`;+ return `${quoteIdentifier(tableName)}.${colPart}`;+ };+const generateRelString = (rel) => {const { fields: startTableFields, name: startTableName } =diagram.tables.find((t) => t.id === rel.startTableId);- const { name: startFieldName } = startTableFields.find(- (f) => f.id === rel.startFieldId,- );const { fields: endTableFields, name: endTableName } = diagram.tables.find((t) => t.id === rel.endTableId,);- const { name: endFieldName } = endTableFields.find(- (f) => f.id === rel.endFieldId,++ const pairs = getRelationshipFields(rel);+ const startFieldNames = pairs.map(+ (p) => startTableFields.find((f) => f.id === p.startFieldId)?.name,+ );+ const endFieldNames = pairs.map(+ (p) => endTableFields.find((f) => f.id === p.endFieldId)?.name,);- return `Ref ${quoteIdentifier(rel.name)} {\n\t${quoteIdentifier(startTableName)}.${quoteIdentifier(startFieldName)} ${cardinality(rel)} ${quoteIdentifier(endTableName)}.${quoteIdentifier(endFieldName)} [ delete: ${rel.deleteConstraint.toLowerCase()}, update: ${rel.updateConstraint.toLowerCase()} ]\n}`;+ return `Ref ${quoteIdentifier(rel.name)} {\n\t${columnRef(startTableName, startFieldNames)} ${cardinality(rel)} ${columnRef(endTableName, endFieldNames)} [ delete: ${rel.deleteConstraint.toLowerCase()}, update: ${rel.updateConstraint.toLowerCase()} ]\n}`;};let enumDefinitions = "";diff --git a/src/utils/exportAs/documentation.js b/src/utils/exportAs/documentation.jsindex a8b3ea04..16ba2853 100644--- a/src/utils/exportAs/documentation.js+++ b/src/utils/exportAs/documentation.js@@ -1,6 +1,7 @@import { dbToTypes } from "../../data/datatypes";import { jsonToMermaid } from "./mermaid";import { databases } from "../../data/databases";+import { getRelationshipFields } from "../utils";function formatMarkdownTable(headers, rows) {const allRows = [headers, ...rows];@@ -99,7 +100,11 @@ export function jsonToDocumentation(obj) {function relationshipByField(table, relationships, fieldId) {return relationships- .filter((r) => r.startTableId === table && r.startFieldId === fieldId)+ .filter(+ (r) =>+ r.startTableId === table &&+ getRelationshipFields(r).some((p) => p.startFieldId === fieldId),+ ).map((rel) => rel.name);}diff --git a/src/utils/exportSQL/generic.js b/src/utils/exportSQL/generic.jsindex f61c582a..ce859d8a 100644--- a/src/utils/exportSQL/generic.js+++ b/src/utils/exportSQL/generic.js@@ -5,6 +5,7 @@ import {getInlineFK,parseDefault,uniqueConstraintClause,+ getFkColumnNames,} from "./shared";export function getJsonType(f) {@@ -238,14 +239,18 @@ export function jsonToMySQL(obj) {(t) => t.id === r.startTableId,);- const { name: endName, fields: endFields } = obj.tables.find(- (t) => t.id === r.endTableId,+ const endTable = obj.tables.find((t) => t.id === r.endTableId);+ const { name: endName } = endTable;+ const { startColumns, endColumns } = getFkColumnNames(+ r,+ { fields: startFields },+ endTable,);- return `ALTER TABLE \`${startName}\`\nADD FOREIGN KEY(\`${- startFields.find((f) => f.id === r.startFieldId).name- }\`) REFERENCES \`${endName}\`(\`${- endFields.find((f) => f.id === r.endFieldId).name- }\`)\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};`;+ return `ALTER TABLE \`${startName}\`\nADD FOREIGN KEY(${startColumns+ .map((c) => `\`${c}\``)+ .join(", ")}) REFERENCES \`${endName}\`(${endColumns+ .map((c) => `\`${c}\``)+ .join(", ")})\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};`;}).join("\n")}`;}@@ -345,14 +350,18 @@ export function jsonToPostgreSQL(obj) {(t) => t.id === r.startTableId,);- const { name: endName, fields: endFields } = obj.tables.find(- (t) => t.id === r.endTableId,+ const endTable = obj.tables.find((t) => t.id === r.endTableId);+ const { name: endName } = endTable;+ const { startColumns, endColumns } = getFkColumnNames(+ r,+ { fields: startFields },+ endTable,);- return `ALTER TABLE "${startName}"\nADD FOREIGN KEY("${- startFields.find((f) => f.id === r.startFieldId).name- }") REFERENCES "${endName}"("${- endFields.find((f) => f.id === r.endFieldId).name- }")\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};`;+ return `ALTER TABLE "${startName}"\nADD FOREIGN KEY(${startColumns+ .map((c) => `"${c}"`)+ .join(", ")}) REFERENCES "${endName}"(${endColumns+ .map((c) => `"${c}"`)+ .join(", ")})\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};`;}).join("\n")}`;}@@ -483,14 +492,18 @@ export function jsonToMariaDB(obj) {(t) => t.id === r.startTableId,);- const { name: endName, fields: endFields } = obj.tables.find(- (t) => t.id === r.endTableId,+ const endTable = obj.tables.find((t) => t.id === r.endTableId);+ const { name: endName } = endTable;+ const { startColumns, endColumns } = getFkColumnNames(+ r,+ { fields: startFields },+ endTable,);- return `ALTER TABLE \`${startName}\`\nADD FOREIGN KEY(\`${- startFields.find((f) => f.id === r.startFieldId).name- }\`) REFERENCES \`${endName}\`(\`${- endFields.find((f) => f.id === r.endFieldId).name- }\`)\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};`;+ return `ALTER TABLE \`${startName}\`\nADD FOREIGN KEY(${startColumns+ .map((c) => `\`${c}\``)+ .join(", ")}) REFERENCES \`${endName}\`(${endColumns+ .map((c) => `\`${c}\``)+ .join(", ")})\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};`;}).join("\n")}`;}@@ -555,14 +568,18 @@ export function jsonToSQLServer(obj) {(t) => t.id === r.startTableId,);- const { name: endName, fields: endFields } = obj.tables.find(- (t) => t.id === r.endTableId,+ const endTable = obj.tables.find((t) => t.id === r.endTableId);+ const { name: endName } = endTable;+ const { startColumns, endColumns } = getFkColumnNames(+ r,+ { fields: startFields },+ endTable,);- return `ALTER TABLE [${startName}]\nADD FOREIGN KEY([${- startFields.find((f) => f.id === r.startFieldId).name- }]) REFERENCES [${endName}]([${- endFields.find((f) => f.id === r.endFieldId).name- }])\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};\nGO`;+ return `ALTER TABLE [${startName}]\nADD FOREIGN KEY(${startColumns+ .map((c) => `[${c}]`)+ .join(", ")}) REFERENCES [${endName}](${endColumns+ .map((c) => `[${c}]`)+ .join(", ")})\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};\nGO`;}).join("\n")}`;}@@ -628,14 +645,18 @@ export function jsonToOracleSQL(obj) {(t) => t.id === r.startTableId,);- const { name: endName, fields: endFields } = obj.tables.find(- (t) => t.id === r.endTableId,+ const endTable = obj.tables.find((t) => t.id === r.endTableId);+ const { name: endName } = endTable;+ const { startColumns, endColumns } = getFkColumnNames(+ r,+ { fields: startFields },+ endTable,);- return `ALTER TABLE "${startName}"\nADD CONSTRAINT "${r.name}" FOREIGN KEY ("${- startFields.find((f) => f.id === r.startFieldId).name- }") REFERENCES "${endName}"("${- endFields.find((f) => f.id === r.endFieldId).name- }");`;+ return `ALTER TABLE "${startName}"\nADD CONSTRAINT "${r.name}" FOREIGN KEY (${startColumns+ .map((c) => `"${c}"`)+ .join(", ")}) REFERENCES "${endName}"(${endColumns+ .map((c) => `"${c}"`)+ .join(", ")});`;}).join("\n")}`;}diff --git a/src/utils/exportSQL/mariadb.js b/src/utils/exportSQL/mariadb.jsindex 4a04abf0..a6e7a62f 100644--- a/src/utils/exportSQL/mariadb.js+++ b/src/utils/exportSQL/mariadb.js@@ -1,4 +1,9 @@-import { escapeQuotes, parseDefault, uniqueConstraintClause } from "./shared";+import {+ escapeQuotes,+ parseDefault,+ uniqueConstraintClause,+ getFkColumnNames,+} from "./shared";import { dbToTypes } from "../../data/datatypes";import { DB } from "../../data/constants";@@ -64,14 +69,18 @@ export function toMariaDB(diagram) {(t) => t.id === r.startTableId,);- const { name: endName, fields: endFields } = diagram.tables.find(- (t) => t.id === r.endTableId,+ const endTable = diagram.tables.find((t) => t.id === r.endTableId);+ const { name: endName } = endTable;+ const { startColumns, endColumns } = getFkColumnNames(+ r,+ { fields: startFields },+ endTable,);- return `ALTER TABLE \`${startName}\`\nADD FOREIGN KEY(\`${- startFields.find((f) => f.id === r.startFieldId).name- }\`) REFERENCES \`${endName}\`(\`${- endFields.find((f) => f.id === r.endFieldId).name- }\`)\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};`;+ return `ALTER TABLE \`${startName}\`\nADD FOREIGN KEY(${startColumns+ .map((c) => `\`${c}\``)+ .join(", ")}) REFERENCES \`${endName}\`(${endColumns+ .map((c) => `\`${c}\``)+ .join(", ")})\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};`;}).join("\n")}`;}diff --git a/src/utils/exportSQL/mssql.js b/src/utils/exportSQL/mssql.jsindex dae5db68..094bca02 100644--- a/src/utils/exportSQL/mssql.js+++ b/src/utils/exportSQL/mssql.js@@ -1,4 +1,9 @@-import { parseDefault, escapeQuotes, uniqueConstraintClause } from "./shared";+import {+ parseDefault,+ escapeQuotes,+ uniqueConstraintClause,+ getFkColumnNames,+} from "./shared";import { dbToTypes } from "../../data/datatypes";import { DB } from "../../data/constants";@@ -101,14 +106,18 @@ export function toMSSQL(diagram) {if (!startTable || !endTable) return "";- const startField = startTable.fields.find((f) => f.id === r.startFieldId);- const endField = endTable.fields.find((f) => f.id === r.endFieldId);+ const { startColumns, endColumns } = getFkColumnNames(+ r,+ startTable,+ endTable,+ );- if (!startField || !endField) return "";+ if (startColumns.some((c) => !c) || endColumns.some((c) => !c))+ return "";return `\nALTER TABLE [${startTable.name}]-ADD FOREIGN KEY([${startField.name}])-REFERENCES [${endTable.name}]([${endField.name}])+ADD FOREIGN KEY(${startColumns.map((c) => `[${c}]`).join(", ")})+REFERENCES [${endTable.name}](${endColumns.map((c) => `[${c}]`).join(", ")})ON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};GO`;})diff --git a/src/utils/exportSQL/mysql.js b/src/utils/exportSQL/mysql.jsindex 58fa2534..85078ad1 100644--- a/src/utils/exportSQL/mysql.js+++ b/src/utils/exportSQL/mysql.js@@ -1,4 +1,9 @@-import { escapeQuotes, parseDefault, uniqueConstraintClause } from "./shared";+import {+ escapeQuotes,+ parseDefault,+ uniqueConstraintClause,+ getFkColumnNames,+} from "./shared";import { dbToTypes } from "../../data/datatypes";import { DB } from "../../data/constants";@@ -68,14 +73,18 @@ export function toMySQL(diagram) {(t) => t.id === r.startTableId,);- const { name: endName, fields: endFields } = diagram.tables.find(- (t) => t.id === r.endTableId,+ const endTable = diagram.tables.find((t) => t.id === r.endTableId);+ const { name: endName } = endTable;+ const { startColumns, endColumns } = getFkColumnNames(+ r,+ { fields: startFields },+ endTable,);- return `ALTER TABLE \`${startName}\`\nADD FOREIGN KEY(\`${- startFields.find((f) => f.id === r.startFieldId).name- }\`) REFERENCES \`${endName}\`(\`${- endFields.find((f) => f.id === r.endFieldId).name- }\`)\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};`;+ return `ALTER TABLE \`${startName}\`\nADD FOREIGN KEY(${startColumns+ .map((c) => `\`${c}\``)+ .join(", ")}) REFERENCES \`${endName}\`(${endColumns+ .map((c) => `\`${c}\``)+ .join(", ")})\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};`;}).join("\n")}`;}diff --git a/src/utils/exportSQL/oraclesql.js b/src/utils/exportSQL/oraclesql.jsindex 4a746f5a..10646a1f 100644--- a/src/utils/exportSQL/oraclesql.js+++ b/src/utils/exportSQL/oraclesql.js@@ -1,5 +1,9 @@import { dbToTypes } from "../../data/datatypes";-import { parseDefault, uniqueConstraintClause } from "./shared";+import {+ parseDefault,+ uniqueConstraintClause,+ getFkColumnNames,+} from "./shared";export function toOracleSQL(diagram) {return `${diagram.tables@@ -50,14 +54,18 @@ export function toOracleSQL(diagram) {const { name: startName, fields: startFields } = diagram.tables.find((t) => t.id === r.startTableId,);- const { name: endName, fields: endFields } = diagram.tables.find(- (t) => t.id === r.endTableId,+ const endTable = diagram.tables.find((t) => t.id === r.endTableId);+ const { name: endName } = endTable;+ const { startColumns, endColumns } = getFkColumnNames(+ r,+ { fields: startFields },+ endTable,);- return `ALTER TABLE "${startName}"\nADD CONSTRAINT "${r.name}" FOREIGN KEY ("${- startFields.find((f) => f.id === r.startFieldId).name- }") REFERENCES "${endName}" ("${- endFields.find((f) => f.id === r.endFieldId).name- }")\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};`;+ return `ALTER TABLE "${startName}"\nADD CONSTRAINT "${r.name}" FOREIGN KEY (${startColumns+ .map((c) => `"${c}"`)+ .join(", ")}) REFERENCES "${endName}" (${endColumns+ .map((c) => `"${c}"`)+ .join(", ")})\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};`;}).join("\n")}`;}diff --git a/src/utils/exportSQL/postgres.js b/src/utils/exportSQL/postgres.jsindex 52a9aa6f..060e17e2 100644--- a/src/utils/exportSQL/postgres.js+++ b/src/utils/exportSQL/postgres.js@@ -3,6 +3,7 @@ import {exportFieldComment,parseDefault,uniqueConstraintClause,+ getFkColumnNames,} from "./shared";import { dbToTypes } from "../../data/datatypes";@@ -96,14 +97,22 @@ export function toPostgres(diagram) {.map((r) => {const startTable = diagram.tables.find((t) => t.id === r.startTableId);const endTable = diagram.tables.find((t) => t.id === r.endTableId);- const startField = startTable?.fields.find(- (f) => f.id === r.startFieldId,- );- const endField = endTable?.fields.find((f) => f.id === r.endFieldId);- if (!startTable || !endTable || !startField || !endField) return "";+ if (!startTable || !endTable) return "";++ const { startColumns, endColumns } = getFkColumnNames(+ r,+ startTable,+ endTable,+ );+ if (startColumns.some((c) => !c) || endColumns.some((c) => !c))+ return "";- return `ALTER TABLE "${startTable.name}"\nADD FOREIGN KEY("${startField.name}") REFERENCES "${endTable.name}"("${endField.name}")\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};`;+ return `ALTER TABLE "${startTable.name}"\nADD FOREIGN KEY(${startColumns+ .map((c) => `"${c}"`)+ .join(", ")}) REFERENCES "${endTable.name}"(${endColumns+ .map((c) => `"${c}"`)+ .join(", ")})\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};`;}).filter(Boolean).join("\n");diff --git a/src/utils/exportSQL/shared.js b/src/utils/exportSQL/shared.jsindex f6219a46..f9385053 100644--- a/src/utils/exportSQL/shared.js+++ b/src/utils/exportSQL/shared.js@@ -1,8 +1,19 @@-import { isFunction, isKeyword } from "../utils";+import { isFunction, isKeyword, getRelationshipFields } from "../utils";import { DB } from "../../data/constants";import { dbToTypes } from "../../data/datatypes";+export function getFkColumnNames(relationship, startTable, endTable) {+ const pairs = getRelationshipFields(relationship);+ const startColumns = pairs.map(+ (p) => startTable?.fields.find((f) => f.id === p.startFieldId)?.name,+ );+ const endColumns = pairs.map(+ (p) => endTable?.fields.find((f) => f.id === p.endFieldId)?.name,+ );+ return { startColumns, endColumns };+}+export function parseDefault(field, database = DB.GENERIC) {if (isFunction(field.default) ||@@ -53,14 +64,18 @@ export function getInlineFK(table, obj) {let fks = [];obj.references.forEach((r) => {if (r.startTableId === table.id) {+ const endTable = obj.tables.find((t) => t.id === r.endTableId);+ const { startColumns, endColumns } = getFkColumnNames(+ r,+ table,+ endTable,+ );fks.push(- `\tFOREIGN KEY ("${table.fields.find((f) => f.id === r.startFieldId)?.name}") REFERENCES "${- obj.tables.find((t) => t.id === r.endTableId)?.name- }"("${- obj.tables- .find((t) => t.id === r.endTableId)- .fields.find((f) => f.id === r.endFieldId)?.name- }")\n\tON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()}`,+ `\tFOREIGN KEY (${startColumns+ .map((c) => `"${c}"`)+ .join(", ")}) REFERENCES "${endTable?.name}"(${endColumns+ .map((c) => `"${c}"`)+ .join(", ")})\n\tON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()}`,);}});diff --git a/src/utils/importFrom/dbml.js b/src/utils/importFrom/dbml.jsindex 8699aa25..5ef3c5f9 100644--- a/src/utils/importFrom/dbml.js+++ b/src/utils/importFrom/dbml.js@@ -58,8 +58,9 @@ export function fromDBML(src) {for (const ref of schema.refs) {const startTableName = ref.endpoints[0].tableName;const endTableName = ref.endpoints[1].tableName;- const startFieldName = ref.endpoints[0].fieldNames[0];- const endFieldName = ref.endpoints[1].fieldNames[0];+ const startFieldNames = ref.endpoints[0].fieldNames;+ const endFieldNames = ref.endpoints[1].fieldNames;+ const startFieldName = startFieldNames[0];const startTable = tables.find((t) => t.name === startTableName);if (!startTable) continue;@@ -67,13 +68,14 @@ export function fromDBML(src) {const endTable = tables.find((t) => t.name === endTableName);if (!endTable) continue;- const endField = endTable.fields.find((f) => f.name === endFieldName);- if (!endField) continue;-- const startField = startTable.fields.find(- (f) => f.name === startFieldName,- );- if (!startField) continue;+ const fieldPairs = [];+ for (let i = 0; i < startFieldNames.length; i++) {+ const sf = startTable.fields.find((f) => f.name === startFieldNames[i]);+ const ef = endTable.fields.find((f) => f.name === endFieldNames[i]);+ if (!sf || !ef) break;+ fieldPairs.push({ startFieldId: sf.id, endFieldId: ef.id });+ }+ if (fieldPairs.length !== startFieldNames.length) continue;const relationship = {};@@ -81,8 +83,9 @@ export function fromDBML(src) {"fk_" + startTableName + "_" + startFieldName + "_" + endTableName;relationship.startTableId = startTable.id;relationship.endTableId = endTable.id;- relationship.endFieldId = endField.id;- relationship.startFieldId = startField.id;+ relationship.fields = fieldPairs;+ relationship.endFieldId = fieldPairs[0].endFieldId;+ relationship.startFieldId = fieldPairs[0].startFieldId;relationship.id = nanoid();relationship.updateConstraint = ref.onDeletediff --git a/src/utils/importSQL/mariadb.js b/src/utils/importSQL/mariadb.jsindex 0b83cbfd..6b4c2653 100644--- a/src/utils/importSQL/mariadb.js+++ b/src/utils/importSQL/mariadb.js@@ -112,28 +112,39 @@ export function fromMariaDB(ast, diagramDb = DB.GENERIC) {const relationship = {};const startTableId = table.id;const startTableName = e.table[0].table;- const startFieldName = d.definition[0].column;+ const startFieldNames = d.definition.map((c) => c.column);const endTableName = d.reference_definition.table[0].table;- const endFieldName = d.reference_definition.definition[0].column;+ const endFieldNames = d.reference_definition.definition.map(+ (c) => c.column,+ );+ const startFieldName = startFieldNames[0];const endTable = tables.find((t) => t.name === endTableName);if (!endTable) return;- const endField = endTable.fields.find(- (f) => f.name === endFieldName,- );- if (!endField) return;+ const fieldPairs = [];+ for (let i = 0; i < startFieldNames.length; i++) {+ const sf = table.fields.find(+ (f) => f.name === startFieldNames[i],+ );+ const ef = endTable.fields.find(+ (f) => f.name === endFieldNames[i],+ );+ if (!sf || !ef) break;+ fieldPairs.push({ startFieldId: sf.id, endFieldId: ef.id });+ }+ if (fieldPairs.length !== startFieldNames.length) return;const startField = table.fields.find((f) => f.name === startFieldName,);- if (!startField) return;relationship.name = `fk_${startTableName}_${startFieldName}_${endTableName}`;relationship.startTableId = startTableId;relationship.endTableId = endTable.id;- relationship.endFieldId = endField.id;- relationship.startFieldId = startField.id;+ relationship.fields = fieldPairs;+ relationship.endFieldId = fieldPairs[0].endFieldId;+ relationship.startFieldId = fieldPairs[0].startFieldId;relationship.id = nanoid()let updateConstraint = "No action";let deleteConstraint = "No action";@@ -210,11 +221,16 @@ export function fromMariaDB(ast, diagramDb = DB.GENERIC) {) {const relationship = {};const startTableName = e.table[0].table;- const startFieldName = expr.create_definitions.definition[0].column;+ const startFieldNames = expr.create_definitions.definition.map(+ (c) => c.column,+ );const endTableName =expr.create_definitions.reference_definition.table[0].table;- const endFieldName =- expr.create_definitions.reference_definition.definition[0].column;+ const endFieldNames =+ expr.create_definitions.reference_definition.definition.map(+ (c) => c.column,+ );+ const startFieldName = startFieldNames[0];let updateConstraint = "No action";let deleteConstraint = "No action";expr.create_definitions.reference_definition.on_action.forEach(@@ -239,20 +255,30 @@ export function fromMariaDB(ast, diagramDb = DB.GENERIC) {const endTable = tables.find((t) => t.name === endTableName);if (!endTable) return;- const endField = endTable.fields.find((f) => f.name === endFieldName);- if (!endField) return;+ const fieldPairs = [];+ for (let i = 0; i < startFieldNames.length; i++) {+ const sf = startTable.fields.find(+ (f) => f.name === startFieldNames[i],+ );+ const ef = endTable.fields.find(+ (f) => f.name === endFieldNames[i],+ );+ if (!sf || !ef) break;+ fieldPairs.push({ startFieldId: sf.id, endFieldId: ef.id });+ }+ if (fieldPairs.length !== startFieldNames.length) return;const startField = startTable.fields.find((f) => f.name === startFieldName,);- if (!startField) return;relationship.name ="fk_" + startTableName + "_" + startFieldName + "_" + endTableName;relationship.startTableId = startTable.id;- relationship.startFieldId = startField.id;+ relationship.startFieldId = fieldPairs[0].startFieldId;relationship.endTableId = endTable.id;- relationship.endFieldId = endField.id;+ relationship.endFieldId = fieldPairs[0].endFieldId;+ relationship.fields = fieldPairs;relationship.updateConstraint = updateConstraint;relationship.deleteConstraint = deleteConstraint;relationship.id = nanoid();diff --git a/src/utils/importSQL/mssql.js b/src/utils/importSQL/mssql.jsindex b402e568..e9aea86d 100644--- a/src/utils/importSQL/mssql.js+++ b/src/utils/importSQL/mssql.js@@ -124,28 +124,39 @@ export function fromMSSQL(ast, diagramDb = DB.GENERIC) {const relationship = {};const startTableId = table.id;const startTableName = e.table[0].table;- const startFieldName = d.definition[0].column;+ const startFieldNames = d.definition.map((c) => c.column);const endTableName = d.reference_definition.table[0].table;- const endFieldName = d.reference_definition.definition[0].column;+ const endFieldNames = d.reference_definition.definition.map(+ (c) => c.column,+ );+ const startFieldName = startFieldNames[0];const endTable = tables.find((t) => t.name === endTableName);if (!endTable) return;- const endField = endTable.fields.find(- (f) => f.name === endFieldName,- );- if (!endField) return;+ const fieldPairs = [];+ for (let i = 0; i < startFieldNames.length; i++) {+ const sf = table.fields.find(+ (f) => f.name === startFieldNames[i],+ );+ const ef = endTable.fields.find(+ (f) => f.name === endFieldNames[i],+ );+ if (!sf || !ef) break;+ fieldPairs.push({ startFieldId: sf.id, endFieldId: ef.id });+ }+ if (fieldPairs.length !== startFieldNames.length) return;const startField = table.fields.find((f) => f.name === startFieldName,);- if (!startField) return;relationship.name = `fk_${startTableName}_${startFieldName}_${endTableName}`;relationship.startTableId = startTableId;relationship.endTableId = endTable.id;- relationship.endFieldId = endField.id;- relationship.startFieldId = startField.id;+ relationship.fields = fieldPairs;+ relationship.endFieldId = fieldPairs[0].endFieldId;+ relationship.startFieldId = fieldPairs[0].startFieldId;relationship.id = nanoid();let updateConstraint = "No action";@@ -216,11 +227,16 @@ export function fromMSSQL(ast, diagramDb = DB.GENERIC) {) {const relationship = {};const startTableName = e.table[0].table;- const startFieldName = expr.create_definitions.definition[0].column;+ const startFieldNames = expr.create_definitions.definition.map(+ (c) => c.column,+ );const endTableName =expr.create_definitions.reference_definition.table[0].table;- const endFieldName =- expr.create_definitions.reference_definition.definition[0].column;+ const endFieldNames =+ expr.create_definitions.reference_definition.definition.map(+ (c) => c.column,+ );+ const startFieldName = startFieldNames[0];let updateConstraint = "No action";let deleteConstraint = "No action";expr.create_definitions.reference_definition.on_action.forEach(@@ -245,19 +261,29 @@ export function fromMSSQL(ast, diagramDb = DB.GENERIC) {const endTable = tables.find((t) => t.name === endTableName);if (!endTable) return;- const endField = endTable.fields.find((f) => f.name === endFieldName);- if (!endField) return;+ const fieldPairs = [];+ for (let i = 0; i < startFieldNames.length; i++) {+ const sf = startTable.fields.find(+ (f) => f.name === startFieldNames[i],+ );+ const ef = endTable.fields.find(+ (f) => f.name === endFieldNames[i],+ );+ if (!sf || !ef) break;+ fieldPairs.push({ startFieldId: sf.id, endFieldId: ef.id });+ }+ if (fieldPairs.length !== startFieldNames.length) return;const startField = startTable.fields.find((f) => f.name === startFieldName,);- if (!startField) return;relationship.name = `fk_${startTableName}_${startFieldName}_${endTableName}`;relationship.startTableId = startTable.id;- relationship.startFieldId = startField.id;+ relationship.startFieldId = fieldPairs[0].startFieldId;relationship.endTableId = endTable.id;- relationship.endFieldId = endField.id;+ relationship.endFieldId = fieldPairs[0].endFieldId;+ relationship.fields = fieldPairs;relationship.updateConstraint = updateConstraint;relationship.deleteConstraint = deleteConstraint;relationship.id = nanoid();diff --git a/src/utils/importSQL/mysql.js b/src/utils/importSQL/mysql.jsindex 874b4097..84321cd6 100644--- a/src/utils/importSQL/mysql.js+++ b/src/utils/importSQL/mysql.js@@ -111,28 +111,39 @@ export function fromMySQL(ast, diagramDb = DB.GENERIC) {} else if (d.constraint_type.toLowerCase() === "foreign key") {const relationship = {};const startTableName = e.table[0].table;- const startFieldName = d.definition[0].column;+ const startFieldNames = d.definition.map((c) => c.column);const endTableName = d.reference_definition.table[0].table;- const endFieldName = d.reference_definition.definition[0].column;+ const endFieldNames = d.reference_definition.definition.map(+ (c) => c.column,+ );+ const startFieldName = startFieldNames[0];const endTable = tables.find((t) => t.name === endTableName);if (!endTable) return;- const endField = endTable.fields.find(- (f) => f.name === endFieldName,- );- if (!endField) return;-+ // Resolve every column pair (composite FKs carry more than one).+ const fieldPairs = [];+ for (let i = 0; i < startFieldNames.length; i++) {+ const sf = table.fields.find(+ (f) => f.name === startFieldNames[i],+ );+ const ef = endTable.fields.find(+ (f) => f.name === endFieldNames[i],+ );+ if (!sf || !ef) break;+ fieldPairs.push({ startFieldId: sf.id, endFieldId: ef.id });+ }+ if (fieldPairs.length !== startFieldNames.length) return;const startField = table.fields.find((f) => f.name === startFieldName,);- if (!startField) return;relationship.name = `fk_${startTableName}_${startFieldName}_${endTableName}`;relationship.startTableId = table.id;relationship.endTableId = endTable.id;- relationship.endFieldId = endField.id;- relationship.startFieldId = startField.id;+ relationship.fields = fieldPairs;+ relationship.endFieldId = fieldPairs[0].endFieldId;+ relationship.startFieldId = fieldPairs[0].startFieldId;relationship.id = nanoid();let updateConstraint = "No action";@@ -210,11 +221,16 @@ export function fromMySQL(ast, diagramDb = DB.GENERIC) {) {const relationship = {};const startTableName = e.table[0].table;- const startFieldName = expr.create_definitions.definition[0].column;+ const startFieldNames = expr.create_definitions.definition.map(+ (c) => c.column,+ );const endTableName =expr.create_definitions.reference_definition.table[0].table;- const endFieldName =- expr.create_definitions.reference_definition.definition[0].column;+ const endFieldNames =+ expr.create_definitions.reference_definition.definition.map(+ (c) => c.column,+ );+ const startFieldName = startFieldNames[0];let updateConstraint = "No action";let deleteConstraint = "No action";expr.create_definitions.reference_definition.on_action.forEach(@@ -239,19 +255,29 @@ export function fromMySQL(ast, diagramDb = DB.GENERIC) {const endTable = tables.find((t) => t.name === endTableName);if (!endTable) return;- const endField = endTable.fields.find((f) => f.name === endFieldName);- if (!endField) return;+ const fieldPairs = [];+ for (let i = 0; i < startFieldNames.length; i++) {+ const sf = startTable.fields.find(+ (f) => f.name === startFieldNames[i],+ );+ const ef = endTable.fields.find(+ (f) => f.name === endFieldNames[i],+ );+ if (!sf || !ef) break;+ fieldPairs.push({ startFieldId: sf.id, endFieldId: ef.id });+ }+ if (fieldPairs.length !== startFieldNames.length) return;const startField = startTable.fields.find((f) => f.name === startFieldName,);- if (!startField) return;relationship.name = `fk_${startTableName}_${startFieldName}_${endTableName}`;relationship.startTableId = startTable.id;- relationship.startFieldId = startField.id;+ relationship.startFieldId = fieldPairs[0].startFieldId;relationship.endTableId = endTable.id;- relationship.endFieldId = endField.id;+ relationship.endFieldId = fieldPairs[0].endFieldId;+ relationship.fields = fieldPairs;relationship.updateConstraint = updateConstraint;relationship.deleteConstraint = deleteConstraint;relationship.id = nanoid();diff --git a/src/utils/importSQL/oraclesql.js b/src/utils/importSQL/oraclesql.jsindex 7a057458..33292277 100644--- a/src/utils/importSQL/oraclesql.js+++ b/src/utils/importSQL/oraclesql.js@@ -100,28 +100,37 @@ export function fromOracleSQL(ast, diagramDb = DB.GENERIC) {if (!d.constraint?.reference) return;const relationship = {};- const startFieldName = d.constraint.columns[0];- const endFieldName = d.constraint.reference.columns[0];+ const startFieldNames = d.constraint.columns;+ const endFieldNames = d.constraint.reference.columns;+ const startFieldName = startFieldNames[0];const endTableName = d.constraint.reference.object.name;const endTable = tables.find((t) => t.name === endTableName);if (!endTable) return;- const endField = endTable.fields.find(- (f) => f.name === endFieldName,- );- if (!endField) return;+ const fieldPairs = [];+ for (let i = 0; i < startFieldNames.length; i++) {+ const sf = table.fields.find(+ (f) => f.name === startFieldNames[i],+ );+ const ef = endTable.fields.find(+ (f) => f.name === endFieldNames[i],+ );+ if (!sf || !ef) break;+ fieldPairs.push({ startFieldId: sf.id, endFieldId: ef.id });+ }+ if (fieldPairs.length !== startFieldNames.length) return;const startField = table.fields.find((f) => f.name === startFieldName,);- if (!startField) return;relationship.id = nanoid();relationship.startTableId = table.id;- relationship.startFieldId = startField.id;+ relationship.startFieldId = fieldPairs[0].startFieldId;relationship.endTableId = endTable.id;- relationship.endFieldId = endField.id;+ relationship.endFieldId = fieldPairs[0].endFieldId;+ relationship.fields = fieldPairs;relationship.updateConstraint = Constraint.NONE;relationship.name =d.name && Boolean(d.name.trim())diff --git a/src/utils/importSQL/postgres.js b/src/utils/importSQL/postgres.jsindex ea739cf8..e8c028c0 100644--- a/src/utils/importSQL/postgres.js+++ b/src/utils/importSQL/postgres.js@@ -130,29 +130,41 @@ export function fromPostgres(ast, diagramDb = DB.GENERIC) {const relationship = {};const startTableId = table.id;const startTableName = e.table[0].table;- const startFieldName = d.definition[0].column.expr.value;+ const startFieldNames = d.definition.map(+ (c) => c.column.expr.value,+ );const endTableName = d.reference_definition.table[0].table;- const endFieldName =- d.reference_definition.definition[0].column.expr.value;+ const endFieldNames = d.reference_definition.definition.map(+ (c) => c.column.expr.value,+ );+ const startFieldName = startFieldNames[0];const endTable = tables.find((t) => t.name === endTableName);if (!endTable) return;- const endField = endTable.fields.find(- (f) => f.name === endFieldName,- );- if (!endField) return;+ const fieldPairs = [];+ for (let i = 0; i < startFieldNames.length; i++) {+ const sf = table.fields.find(+ (f) => f.name === startFieldNames[i],+ );+ const ef = endTable.fields.find(+ (f) => f.name === endFieldNames[i],+ );+ if (!sf || !ef) break;+ fieldPairs.push({ startFieldId: sf.id, endFieldId: ef.id });+ }+ if (fieldPairs.length !== startFieldNames.length) return;const startField = table.fields.find((f) => f.name === startFieldName,);- if (!startField) return;relationship.name = `fk_${startTableName}_${startFieldName}_${endTableName}`;relationship.startTableId = startTableId;relationship.endTableId = endTable.id;- relationship.endFieldId = endField.id;- relationship.startFieldId = startField.id;+ relationship.fields = fieldPairs;+ relationship.endFieldId = fieldPairs[0].endFieldId;+ relationship.startFieldId = fieldPairs[0].startFieldId;relationship.id = nanoid();let updateConstraint = Constraint.NONE;@@ -315,13 +327,16 @@ export function fromPostgres(ast, diagramDb = DB.GENERIC) {) {const relationship = {};const startTableName = e.table[0].table;- const startFieldName =- expr.create_definitions.definition[0].column.expr.value;+ const startFieldNames = expr.create_definitions.definition.map(+ (c) => c.column.expr.value,+ );const endTableName =expr.create_definitions.reference_definition.table[0].table;- const endFieldName =- expr.create_definitions.reference_definition.definition[0].column- .expr.value;+ const endFieldNames =+ expr.create_definitions.reference_definition.definition.map(+ (c) => c.column.expr.value,+ );+ const startFieldName = startFieldNames[0];let updateConstraint = Constraint.NONE;let deleteConstraint = Constraint.NONE;expr.create_definitions.reference_definition.on_action.forEach(@@ -346,21 +361,29 @@ export function fromPostgres(ast, diagramDb = DB.GENERIC) {const endTable = tables.find((t) => t.name === endTableName);if (!endTable) return;- const endField = endTable.fields.find(- (f) => f.name === endFieldName,- );- if (!endField) return;+ const fieldPairs = [];+ for (let i = 0; i < startFieldNames.length; i++) {+ const sf = startTable.fields.find(+ (f) => f.name === startFieldNames[i],+ );+ const ef = endTable.fields.find(+ (f) => f.name === endFieldNames[i],+ );+ if (!sf || !ef) break;+ fieldPairs.push({ startFieldId: sf.id, endFieldId: ef.id });+ }+ if (fieldPairs.length !== startFieldNames.length) return;const startField = startTable.fields.find((f) => f.name === startFieldName,);- if (!startField) return;relationship.name = `fk_${startTableName}_${startFieldName}_${endTableName}`;relationship.startTableId = startTable.id;- relationship.startFieldId = startField.id;+ relationship.startFieldId = fieldPairs[0].startFieldId;relationship.endTableId = endTable.id;- relationship.endFieldId = endField.id;+ relationship.endFieldId = fieldPairs[0].endFieldId;+ relationship.fields = fieldPairs;relationship.updateConstraint = updateConstraint;relationship.deleteConstraint = deleteConstraint;relationship.cardinality = Cardinality.ONE_TO_ONE;diff --git a/src/utils/importSQL/sqlite.js b/src/utils/importSQL/sqlite.jsindex f9a95a14..da9d6587 100644--- a/src/utils/importSQL/sqlite.js+++ b/src/utils/importSQL/sqlite.js@@ -43,28 +43,35 @@ export function fromSQLite(ast, diagramDb = DB.GENERIC) {const addRelationshipFromReferenceDef = (startTable,- startFieldName,+ startFieldNames,referenceDefinition,) => {const relationship = {};const endTableName = referenceDefinition.table[0].table;- const endFieldName = referenceDefinition.definition[0].column;+ const endFieldNames = referenceDefinition.definition.map((c) => c.column);+ const startFieldName = startFieldNames[0];const endTable = tables.find((t) => t.name === endTableName);if (!endTable) return;- const endField = endTable.fields.find((f) => f.name === endFieldName);- if (!endField) return;+ const fieldPairs = [];+ for (let i = 0; i < startFieldNames.length; i++) {+ const sf = startTable.fields.find((f) => f.name === startFieldNames[i]);+ const ef = endTable.fields.find((f) => f.name === endFieldNames[i]);+ if (!sf || !ef) break;+ fieldPairs.push({ startFieldId: sf.id, endFieldId: ef.id });+ }+ if (fieldPairs.length !== startFieldNames.length) return;const startField = startTable.fields.find((f) => f.name === startFieldName);- if (!startField) return;relationship.name ="fk_" + startTable.name + "_" + startFieldName + "_" + endTableName;relationship.startTableId = startTable.id;relationship.endTableId = endTable.id;- relationship.endFieldId = endField.id;- relationship.startFieldId = startField.id;+ relationship.fields = fieldPairs;+ relationship.endFieldId = fieldPairs[0].endFieldId;+ relationship.startFieldId = fieldPairs[0].startFieldId;relationship.id = nanoid();let updateConstraint = "No action";@@ -170,7 +177,7 @@ export function fromSQLite(ast, diagramDb = DB.GENERIC) {if (d.reference_definition) {addRelationshipFromReferenceDef(table,- field.name,+ [field.name],d.reference_definition,);}@@ -186,7 +193,7 @@ export function fromSQLite(ast, diagramDb = DB.GENERIC) {} else if (d.constraint_type.toLowerCase() === "foreign key") {addRelationshipFromReferenceDef(table,- d.definition[0].column,+ d.definition.map((c) => c.column),d.reference_definition,);} else if (d.constraint_type.toLowerCase().includes("unique")) {diff --git a/src/utils/migrations/diffToSQL.js b/src/utils/migrations/diffToSQL.jsindex 97120332..ec4b3881 100644--- a/src/utils/migrations/diffToSQL.js+++ b/src/utils/migrations/diffToSQL.js@@ -7,6 +7,7 @@ import {import { DB } from "../../data/constants";import { databases } from "../../data/databases";import { dbToTypes } from "../../data/datatypes";+import { getRelationshipFields } from "../utils";function getQuote(db) {if (db === DB.MYSQL || db === DB.MARIADB) return (s) => `\`${s}\``;@@ -190,17 +191,29 @@ function resolveRel(diagram, rel) {const startT = tables.find((t) => t.id === rel.startTableId);const endT = tables.find((t) => t.id === rel.endTableId);if (!startT || !endT) return null;- const startF = (startT.fields || []).find((f) => f.id === rel.startFieldId);- const endF = (endT.fields || []).find((f) => f.id === rel.endFieldId);- if (!startF || !endF) return null;+ const pairs = getRelationshipFields(rel);+ const startFieldNames = pairs.map(+ (p) => (startT.fields || []).find((f) => f.id === p.startFieldId)?.name,+ );+ const endFieldNames = pairs.map(+ (p) => (endT.fields || []).find((f) => f.id === p.endFieldId)?.name,+ );+ if (startFieldNames.some((n) => !n) || endFieldNames.some((n) => !n))+ return null;return {startTableName: startT.name,- startFieldName: startF.name,+ startFieldName: startFieldNames[0],endTableName: endT.name,- endFieldName: endF.name,+ endFieldName: endFieldNames[0],+ startFieldNames,+ endFieldNames,};}+function fkCols(names, q) {+ return names.map((n) => q(n)).join(", ");+}+function normalizeFkAction(s) {return (s || "No action").toString().toUpperCase();}@@ -764,7 +777,7 @@ export const generateMigrationSQL = (const resolved = resolveRel(diagrams.to, change.to);if (!resolved) break;- const addFk = `ALTER TABLE ${q(resolved.startTableName)} ADD CONSTRAINT ${q(change.to.name)} FOREIGN KEY (${q(resolved.startFieldName)}) REFERENCES ${q(resolved.endTableName)} (${q(resolved.endFieldName)}) ON UPDATE ${normalizeFkAction(change.to.updateConstraint)} ON DELETE ${normalizeFkAction(change.to.deleteConstraint)};`;+ const addFk = `ALTER TABLE ${q(resolved.startTableName)} ADD CONSTRAINT ${q(change.to.name)} FOREIGN KEY (${fkCols(resolved.startFieldNames, q)}) REFERENCES ${q(resolved.endTableName)} (${fkCols(resolved.endFieldNames, q)}) ON UPDATE ${normalizeFkAction(change.to.updateConstraint)} ON DELETE ${normalizeFkAction(change.to.deleteConstraint)};`;up.push(addFk);const dropFk =database === DB.MYSQL || database === DB.MARIADB@@ -781,7 +794,7 @@ export const generateMigrationSQL = (? `ALTER TABLE ${q(resolved.startTableName)} DROP FOREIGN KEY ${q(change.from.name)};`: `ALTER TABLE ${q(resolved.startTableName)} DROP CONSTRAINT ${q(change.from.name)};`;up.push(dropFk);- const addFk = `ALTER TABLE ${q(resolved.startTableName)} ADD CONSTRAINT ${q(change.from.name)} FOREIGN KEY (${q(resolved.startFieldName)}) REFERENCES ${q(resolved.endTableName)} (${q(resolved.endFieldName)}) ON UPDATE ${normalizeFkAction(change.from.updateConstraint)} ON DELETE ${normalizeFkAction(change.from.deleteConstraint)};`;+ const addFk = `ALTER TABLE ${q(resolved.startTableName)} ADD CONSTRAINT ${q(change.from.name)} FOREIGN KEY (${fkCols(resolved.startFieldNames, q)}) REFERENCES ${q(resolved.endTableName)} (${fkCols(resolved.endFieldNames, q)}) ON UPDATE ${normalizeFkAction(change.from.updateConstraint)} ON DELETE ${normalizeFkAction(change.from.deleteConstraint)};`;down.push(addFk);}break;@@ -813,7 +826,7 @@ export const generateMigrationSQL = (? `ALTER TABLE ${q(resolved.startTableName)} DROP FOREIGN KEY ${q(rel.name)};`: `ALTER TABLE ${q(resolved.startTableName)} DROP CONSTRAINT ${q(rel.name)};`;const addFk = (rel, resolved) =>- `ALTER TABLE ${q(resolved.startTableName)} ADD CONSTRAINT ${q(rel.name)} FOREIGN KEY (${q(resolved.startFieldName)}) REFERENCES ${q(resolved.endTableName)} (${q(resolved.endFieldName)}) ON UPDATE ${normalizeFkAction(rel.updateConstraint)} ON DELETE ${normalizeFkAction(rel.deleteConstraint)};`;+ `ALTER TABLE ${q(resolved.startTableName)} ADD CONSTRAINT ${q(rel.name)} FOREIGN KEY (${fkCols(resolved.startFieldNames, q)}) REFERENCES ${q(resolved.endTableName)} (${fkCols(resolved.endFieldNames, q)}) ON UPDATE ${normalizeFkAction(rel.updateConstraint)} ON DELETE ${normalizeFkAction(rel.deleteConstraint)};`;up.push(dropFk(resolvedTo, relTo));up.push(addFk(relTo, resolvedTo));down.push(dropFk(resolvedFrom, relFrom));diff --git a/src/utils/utils.js b/src/utils/utils.jsindex a2fdb4d9..4c7cb37e 100644--- a/src/utils/utils.js+++ b/src/utils/utils.js@@ -159,20 +159,36 @@ export function getFieldHeight(field, containerWidth, showComments = true) {);}+export function getRelationshipFields(relationship) {+ if (+ Array.isArray(relationship?.fields) &&+ relationship.fields.length > 0+ ) {+ return relationship.fields;+ }+ return [+ {+ startFieldId: relationship?.startFieldId,+ endFieldId: relationship?.endFieldId,+ },+ ];+}+export function isFieldRelatedToTable(tableId,field,fieldIndex,relationships = [],) {- return relationships.some(- (relationship) =>- (relationship.startTableId === tableId &&- (relationship.startFieldId === field.id ||- relationship.startFieldId === fieldIndex)) ||- (relationship.endTableId === tableId &&- (relationship.endFieldId === field.id ||- relationship.endFieldId === fieldIndex)),+ return relationships.some((relationship) =>+ getRelationshipFields(relationship).some(+ (pair) =>+ (relationship.startTableId === tableId &&+ (pair.startFieldId === field.id ||+ pair.startFieldId === fieldIndex)) ||+ (relationship.endTableId === tableId &&+ (pair.endFieldId === field.id || pair.endFieldId === fieldIndex)),+ ),);}