Skip to content

Free, simple, and intuitive online database diagram editor and SQL generator.

Add views (#1138)

1ilit9e2c16aa25f1
diff --git a/src/components/EditorCanvas/Canvas.jsx b/src/components/EditorCanvas/Canvas.jsx
index 8a6a9ad4..ca575132 100644
--- a/src/components/EditorCanvas/Canvas.jsx
+++ b/src/components/EditorCanvas/Canvas.jsx
@@ -13,6 +13,7 @@ import {
} from "../../data/constants";
import { Toast } from "@douyinfe/semi-ui";
import Table from "./Table";
+import View from "./View";
import Area from "./Area";
import Relationship from "./Relationship";
import Note from "./Note";
@@ -28,10 +29,12 @@ import {
useLayout,
useSaveState,
useCollab,
+ useViews,
} from "../../hooks";
import { useTranslation } from "react-i18next";
import { useEventListener } from "usehooks-ts";
import { areFieldsCompatible, getTableHeight } from "../../utils/utils";
+import { getViewHeight, resolveViewColumns } from "../../utils/views";
import { getRectFromEndpoints, isInsideRect } from "../../utils/rect";
import { State, noteWidth } from "../../data/constants";
import { nanoid } from "nanoid";
@@ -50,6 +53,7 @@ export default function Canvas() {
useDiagram();
const { setSaveState } = useSaveState();
const { areas, updateArea } = useAreas();
+ const { views, updateView } = useViews();
const { notes, updateNote } = useNotes();
const { layout } = useLayout();
const { settings } = useSettings();
@@ -177,6 +181,31 @@ export default function Canvas() {
}
});
+ views.forEach((view) => {
+ if (view.locked) return;
+
+ const element = {
+ id: view.id,
+ type: ObjectType.VIEW,
+ currentCoords: { x: view.x, y: view.y },
+ initialCoords: { x: view.x, y: view.y },
+ };
+ const viewRect = {
+ x: view.x,
+ y: view.y,
+ width: settings.tableWidth,
+ height: getViewHeight(
+ view,
+ resolveViewColumns(view, tables),
+ settings.tableWidth,
+ settings.showComments,
+ ),
+ };
+ if (shouldAddElement(viewRect, element)) {
+ elements.push(element);
+ }
+ });
+
areas.forEach((area) => {
if (area.locked) return;
@@ -371,6 +400,9 @@ export default function Canvas() {
if (el.type === ObjectType.NOTE) {
updateNote(el.id, { ...elementFinalCoords });
}
+ if (el.type === ObjectType.VIEW) {
+ updateView(el.id, { ...elementFinalCoords });
+ }
newBulkSelectedElements.push({
...el,
currentCoords: elementFinalCoords,
@@ -449,7 +481,8 @@ export default function Canvas() {
// don't pan if the sidesheet for editing a table is open
if (
- selectedElement.element === ObjectType.TABLE &&
+ (selectedElement.element === ObjectType.TABLE ||
+ selectedElement.element === ObjectType.VIEW) &&
selectedElement.open &&
!layout.sidebar
)
@@ -807,6 +840,18 @@ export default function Canvas() {
}}
/>
))}
+ {views.map((view) => (
+ <View
+ key={view.id}
+ viewData={view}
+ onPointerDown={() => {
+ elementPointerDown = {
+ element: view,
+ type: ObjectType.VIEW,
+ };
+ }}
+ />
+ ))}
{linking && (
<path
d={`M ${linkingLine.startX} ${linkingLine.startY} L ${linkingLine.endX} ${linkingLine.endY}`}
diff --git a/src/components/EditorCanvas/View.jsx b/src/components/EditorCanvas/View.jsx
new file mode 100644
index 00000000..961a6a0c
--- /dev/null
+++ b/src/components/EditorCanvas/View.jsx
@@ -0,0 +1,322 @@
+import { useMemo } from "react";
+import { Tab, ObjectType } from "../../data/constants";
+import {
+ IconMore,
+ IconDeleteStroked,
+ IconEditStroked,
+ IconCopyStroked,
+ IconLock,
+ IconUnlock,
+} from "@douyinfe/semi-icons";
+import { nanoid } from "nanoid";
+import {
+ Popover,
+ Button,
+ ButtonGroup,
+ SideSheet,
+ Divider,
+} from "@douyinfe/semi-ui";
+import {
+ useLayout,
+ useSettings,
+ useDiagram,
+ useSelect,
+ useViews,
+} from "../../hooks";
+import ViewInfo from "../EditorSidePanel/ViewsTab/ViewInfo";
+import { useTranslation } from "react-i18next";
+import { resolveType } from "../../utils/customTypes";
+import { getViewHeight, resolveViewColumns } from "../../utils/views";
+
+export default function View({ viewData, onPointerDown }) {
+ const { layout } = useLayout();
+ const { database, tables } = useDiagram();
+ const { views, addView, deleteView, updateView } = useViews();
+ const { settings } = useSettings();
+ const { t } = useTranslation();
+ const {
+ selectedElement,
+ setSelectedElement,
+ bulkSelectedElements,
+ setBulkSelectedElements,
+ } = useSelect();
+
+ const borderColor = useMemo(
+ () => (settings.mode === "light" ? "border-zinc-300" : "border-zinc-600"),
+ [settings.mode],
+ );
+
+ const columns = useMemo(
+ () => resolveViewColumns(viewData, tables),
+ [viewData, tables],
+ );
+
+ const height = getViewHeight(
+ viewData,
+ columns,
+ settings.tableWidth,
+ settings.showComments,
+ );
+
+ const isSelected = useMemo(() => {
+ return (
+ (selectedElement.id === viewData.id &&
+ selectedElement.element === ObjectType.VIEW) ||
+ bulkSelectedElements.some(
+ (e) => e.type === ObjectType.VIEW && e.id === viewData.id,
+ )
+ );
+ }, [selectedElement, viewData, bulkSelectedElements]);
+
+ const lockUnlockView = (e) => {
+ const locking = !viewData.locked;
+ updateView(viewData.id, { locked: locking });
+
+ if (locking) {
+ setSelectedElement((prev) => ({
+ ...prev,
+ element: ObjectType.NONE,
+ id: -1,
+ open: false,
+ }));
+ setBulkSelectedElements((prev) =>
+ prev.filter(
+ (el) => el.id !== viewData.id || el.type !== ObjectType.VIEW,
+ ),
+ );
+ return;
+ }
+
+ const elementInBulk = {
+ id: viewData.id,
+ type: ObjectType.VIEW,
+ initialCoords: { x: viewData.x, y: viewData.y },
+ currentCoords: { x: viewData.x, y: viewData.y },
+ };
+ if (e.ctrlKey || e.metaKey) {
+ setBulkSelectedElements((prev) => [...prev, elementInBulk]);
+ } else {
+ setBulkSelectedElements([elementInBulk]);
+ }
+ setSelectedElement((prev) => ({
+ ...prev,
+ element: ObjectType.VIEW,
+ id: viewData.id,
+ open: false,
+ }));
+ };
+
+ const duplicateView = () => {
+ if (layout.readOnly) return;
+ addView({
+ view: {
+ ...viewData,
+ id: nanoid(),
+ name: `${viewData.name}_copy`,
+ x: viewData.x + 24,
+ y: viewData.y + 24,
+ columns: viewData.columns.map((c) => ({ ...c, id: nanoid() })),
+ joins: viewData.joins.map((j) => ({ ...j, id: nanoid() })),
+ conditions: viewData.conditions.map((c) => ({ ...c, id: nanoid() })),
+ },
+ index: views.length,
+ });
+ };
+
+ const openEditor = () => {
+ if (!layout.sidebar) {
+ setSelectedElement((prev) => ({
+ ...prev,
+ element: ObjectType.VIEW,
+ id: viewData.id,
+ open: true,
+ }));
+ return;
+ }
+ setSelectedElement((prev) => ({
+ ...prev,
+ currentTab: Tab.VIEWS,
+ element: ObjectType.VIEW,
+ id: viewData.id,
+ open: true,
+ }));
+ if (selectedElement.currentTab !== Tab.VIEWS) return;
+ document
+ .getElementById(`scroll_view_${viewData.id}`)
+ ?.scrollIntoView({ behavior: "smooth" });
+ };
+
+ if (viewData.hidden) return null;
+
+ return (
+ <>
+ <foreignObject
+ key={viewData.id}
+ x={viewData.x}
+ y={viewData.y}
+ width={settings.tableWidth}
+ height={height}
+ className="group drop-shadow-lg rounded-md cursor-move"
+ onPointerDown={onPointerDown}
+ >
+ <div
+ onDoubleClick={openEditor}
+ className={`border-2 border-dashed hover:border-blue-500 select-none rounded-lg w-full ${
+ settings.mode === "light"
+ ? "bg-zinc-100 text-zinc-800"
+ : "bg-zinc-800 text-zinc-200"
+ } ${isSelected ? "border-solid border-blue-500" : borderColor}`}
+ style={{ direction: "ltr" }}
+ >
+ <div
+ className="h-[10px] w-full rounded-t-md"
+ style={{ backgroundColor: viewData.color }}
+ />
+ <div
+ className={`${
+ columns.length === 0 ? "rounded-b-md" : "border-b border-gray-400"
+ } ${
+ settings.mode === "light" ? "bg-zinc-100" : "bg-zinc-900"
+ } ${viewData.comment && settings.showComments ? "pb-3" : ""}`}
+ >
+ <div className="overflow-hidden font-bold h-[40px] flex justify-between items-center gap-2">
+ <div className="px-3 overflow-hidden text-ellipsis whitespace-nowrap min-w-0 flex-1">
+ {viewData.name}
+ </div>
+ <div className="hidden group-hover:flex items-center shrink-0 pe-2">
+ <ButtonGroup
+ type="tertiary"
+ size="small"
+ aria-label="View actions"
+ >
+ <Button
+ size="small"
+ type="tertiary"
+ title={viewData.locked ? t("unlock") : t("lock")}
+ icon={
+ viewData.locked ? (
+ <IconLock size="small" />
+ ) : (
+ <IconUnlock size="small" />
+ )
+ }
+ disabled={layout.readOnly}
+ onClick={lockUnlockView}
+ />
+ <Popover
+ key={viewData.id}
+ content={
+ <div className="popover-theme flex flex-col py-1 min-w-[160px]">
+ <Button
+ icon={<IconEditStroked />}
+ type="tertiary"
+ theme="borderless"
+ block
+ style={{ justifyContent: "flex-start" }}
+ onClick={openEditor}
+ >
+ {t("edit")}
+ </Button>
+ <Button
+ icon={<IconCopyStroked />}
+ type="tertiary"
+ theme="borderless"
+ block
+ style={{ justifyContent: "flex-start" }}
+ onClick={duplicateView}
+ disabled={layout.readOnly}
+ >
+ {t("duplicate")}
+ </Button>
+ <Divider className="!my-1" />
+ <Button
+ icon={<IconDeleteStroked />}
+ type="danger"
+ theme="borderless"
+ block
+ style={{ justifyContent: "flex-start" }}
+ onClick={() => deleteView(viewData.id)}
+ disabled={layout.readOnly}
+ >
+ {t("delete")}
+ </Button>
+ </div>
+ }
+ position="rightTop"
+ style={{ padding: 8 }}
+ showArrow
+ trigger="click"
+ >
+ <Button
+ size="small"
+ type="tertiary"
+ icon={<IconMore size="small" />}
+ title="See more"
+ />
+ </Popover>
+ </ButtonGroup>
+ </div>
+ </div>
+ {viewData.comment && settings.showComments && (
+ <div className="text-xs px-3 line-clamp-5">
+ {viewData.comment}
+ </div>
+ )}
+ </div>
+
+ {columns.map((column, index) => {
+ const resolved = column.type
+ ? resolveType(database, column.type)
+ : null;
+ return (
+ <div
+ key={column.id ?? index}
+ className={`${
+ index === columns.length - 1 ? "" : "border-b border-gray-400"
+ } h-[36px] px-3 flex justify-between items-center gap-2 overflow-hidden`}
+ title={column.source}
+ >
+ <span className="overflow-hidden text-ellipsis whitespace-nowrap">
+ {column.name}
+ </span>
+ {settings.showDataTypes && resolved && (
+ <span
+ className={
+ "shrink-0 font-mono " +
+ (resolved.isCustom ? "" : resolved.color)
+ }
+ style={resolved.isCustom ? { color: resolved.color } : {}}
+ >
+ {column.type +
+ ((resolved.isSized || resolved.hasPrecision) &&
+ column.size
+ ? `(${column.size})`
+ : "")}
+ </span>
+ )}
+ </div>
+ );
+ })}
+ </div>
+ </foreignObject>
+ <SideSheet
+ title={t("edit")}
+ size="small"
+ visible={
+ selectedElement.element === ObjectType.VIEW &&
+ selectedElement.id === viewData.id &&
+ selectedElement.open &&
+ !layout.sidebar
+ }
+ onCancel={() =>
+ setSelectedElement((prev) => ({ ...prev, open: !prev.open }))
+ }
+ style={{ paddingBottom: "16px" }}
+ >
+ <div className="sidesheet-theme">
+ <ViewInfo data={viewData} />
+ </div>
+ </SideSheet>
+ </>
+ );
+}
diff --git a/src/components/EditorHeader/ControlPanel.jsx b/src/components/EditorHeader/ControlPanel.jsx
index c5b3448a..ff150f8e 100644
--- a/src/components/EditorHeader/ControlPanel.jsx
+++ b/src/components/EditorHeader/ControlPanel.jsx
@@ -52,7 +52,12 @@ import {
import jsPDF from "jspdf";
import { useHotkeys } from "react-hotkeys-hook";
import { Validator } from "jsonschema";
-import { areaSchema, noteSchema, tableSchema } from "../../data/schemas";
+import {
+ areaSchema,
+ noteSchema,
+ tableSchema,
+ viewSchema,
+} from "../../data/schemas";
import { db } from "../../data/db";
import {
useLayout,
@@ -66,12 +71,18 @@ import {
useNotes,
useAreas,
useEnums,
+ useViews,
useFullscreen,
useNavigateWithParams,
} from "../../hooks";
import { enterFullscreen, exitFullscreen } from "../../utils/fullscreen";
import { dataURItoBlob } from "../../utils/utils";
-import { IconAddArea, IconAddNote, IconAddTable } from "../../icons";
+import {
+ IconAddArea,
+ IconAddNote,
+ IconAddTable,
+ IconAddView,
+} from "../../icons";
import LayoutDropdown from "./LayoutDropdown";
import Sidesheet from "./SideSheet/Sidesheet";
import Modal from "./Modal/Modal";
@@ -89,6 +100,7 @@ import { diffDiagram } from "../../utils/dbml/diff";
import { exportSavedData } from "../../utils/exportSavedData";
import { nanoid } from "nanoid";
import { getTableHeight } from "../../utils/utils";
+import { getViewHeight, resolveViewColumns } from "../../utils/views";
import { autoArrange } from "../../utils/autoArrange";
import { findAutoFKRelationships } from "../../utils/autoRelationships";
import { deleteFromCache, STORAGE_KEY } from "../../utils/cache";
@@ -150,6 +162,7 @@ export default function ControlPanel({
} = useDiagram();
const { enums, setEnums, deleteEnum, addEnum, updateEnum } = useEnums();
const { types, addType, deleteType, updateType, setTypes } = useTypes();
+ const { views, setViews, addView, updateView, deleteView } = useViews();
const { notes, setNotes, updateNote, addNote, deleteNote } = useNotes();
const { areas, setAreas, updateArea, addArea, deleteArea } = useAreas();
const { undoStack, redoStack, setUndoStack, setRedoStack } = useUndoRedo();
@@ -195,6 +208,8 @@ export default function ControlPanel({
updateArea(element.id, element.undo);
} else if (element.type === ObjectType.NOTE) {
updateNote(element.id, element.undo);
+ } else if (element.type === ObjectType.VIEW) {
+ updateView(element.id, element.undo);
}
}
setRedoStack((prev) => [...prev, a]);
@@ -219,6 +234,8 @@ export default function ControlPanel({
deleteType(a.data.type.id, false);
} else if (a.element === ObjectType.ENUM) {
deleteEnum(a.data.enum.id, false);
+ } else if (a.element === ObjectType.VIEW) {
+ deleteView(a.data.view.id, false);
}
setRedoStack((prev) => [...prev, a]);
} else if (a.action === Action.MOVE) {
@@ -253,6 +270,8 @@ export default function ControlPanel({
addType(a.data, false);
} else if (a.element === ObjectType.ENUM) {
addEnum(a.data, false);
+ } else if (a.element === ObjectType.VIEW) {
+ addView(a.data, false);
}
setRedoStack((prev) => [...prev, a]);
} else if (a.action === Action.EDIT) {
@@ -373,6 +392,8 @@ export default function ControlPanel({
}
}
}
+ } else if (a.element === ObjectType.VIEW) {
+ updateView(a.vid, a.undo);
} else if (a.element === ObjectType.ENUM) {
updateEnum(a.id, a.undo);
if (a.updatedFields) {
@@ -405,6 +426,8 @@ export default function ControlPanel({
updateArea(element.id, element.redo);
} else if (element.type === ObjectType.NOTE) {
updateNote(element.id, element.redo);
+ } else if (element.type === ObjectType.VIEW) {
+ updateView(element.id, element.redo);
}
}
setUndoStack((prev) => [...prev, a]);
@@ -429,6 +452,8 @@ export default function ControlPanel({
addType(a.data, false);
} else if (a.element === ObjectType.ENUM) {
addEnum(a.data, false);
+ } else if (a.element === ObjectType.VIEW) {
+ addView(a.data, false);
}
setUndoStack((prev) => [...prev, a]);
} else if (a.action === Action.MOVE) {
@@ -462,6 +487,8 @@ export default function ControlPanel({
deleteType(a.data.type.id, false);
} else if (a.element === ObjectType.ENUM) {
deleteEnum(a.data.enum.id, false);
+ } else if (a.element === ObjectType.VIEW) {
+ deleteView(a.data.view.id, false);
}
setUndoStack((prev) => [...prev, a]);
} else if (a.action === Action.EDIT) {
@@ -584,6 +611,8 @@ export default function ControlPanel({
}
}
}
+ } else if (a.element === ObjectType.VIEW) {
+ updateView(a.vid, a.redo);
} else if (a.element === ObjectType.ENUM) {
updateEnum(a.id, a.redo);
if (a.updatedFields) {
@@ -672,6 +701,22 @@ export default function ControlPanel({
);
});
+ views.forEach((view) => {
+ minMaxXY.minX = Math.min(minMaxXY.minX, view.x);
+ minMaxXY.minY = Math.min(minMaxXY.minY, view.y);
+ minMaxXY.maxX = Math.max(minMaxXY.maxX, view.x + settings.tableWidth);
+ minMaxXY.maxY = Math.max(
+ minMaxXY.maxY,
+ view.y +
+ getViewHeight(
+ view,
+ resolveViewColumns(view, tables),
+ settings.tableWidth,
+ settings.showComments,
+ ),
+ );
+ });
+
areas.forEach((area) => {
minMaxXY.minX = Math.min(minMaxXY.minX, area.x);
minMaxXY.minY = Math.min(minMaxXY.minY, area.y);
@@ -784,6 +829,20 @@ export default function ControlPanel({
.getElementById(`scroll_table_${selectedElement.id}`)
.scrollIntoView({ behavior: "smooth" });
}
+ } else if (selectedElement.element === ObjectType.VIEW) {
+ if (!layout.sidebar) {
+ setSelectedElement((prev) => ({ ...prev, open: true }));
+ } else {
+ setSelectedElement((prev) => ({
+ ...prev,
+ open: true,
+ currentTab: Tab.VIEWS,
+ }));
+ if (selectedElement.currentTab !== Tab.VIEWS) return;
+ document
+ .getElementById(`scroll_view_${selectedElement.id}`)
+ ?.scrollIntoView({ behavior: "smooth" });
+ }
} else if (selectedElement.element === ObjectType.AREA) {
if (layout.sidebar) {
setSelectedElement((prev) => ({
@@ -835,6 +894,9 @@ export default function ControlPanel({
case ObjectType.AREA:
deleteArea(selectedElement.id);
break;
+ case ObjectType.VIEW:
+ deleteView(selectedElement.id);
+ break;
default:
break;
}
@@ -872,6 +934,25 @@ export default function ControlPanel({
id: areas.length,
});
break;
+ case ObjectType.VIEW: {
+ const copiedView = views.find((v) => v.id === selectedElement.id);
+ addView({
+ view: {
+ ...copiedView,
+ x: copiedView.x + 20,
+ y: copiedView.y + 20,
+ id: nanoid(),
+ columns: copiedView.columns.map((c) => ({ ...c, id: nanoid() })),
+ joins: copiedView.joins.map((j) => ({ ...j, id: nanoid() })),
+ conditions: copiedView.conditions.map((c) => ({
+ ...c,
+ id: nanoid(),
+ })),
+ },
+ index: views.length,
+ });
+ break;
+ }
default:
break;
}
@@ -895,6 +976,13 @@ export default function ControlPanel({
.writeText(JSON.stringify({ ...areas[selectedElement.id] }))
.catch(() => Toast.error(t("oops_smth_went_wrong")));
break;
+ case ObjectType.VIEW:
+ navigator.clipboard
+ .writeText(
+ JSON.stringify(views.find((v) => v.id === selectedElement.id)),
+ )
+ .catch(() => Toast.error(t("oops_smth_went_wrong")));
+ break;
default:
break;
}
@@ -911,7 +999,23 @@ export default function ControlPanel({
return;
}
const v = new Validator();
- if (v.validate(obj, tableSchema).valid) {
+ if (v.validate(obj, viewSchema).valid) {
+ addView({
+ view: {
+ ...obj,
+ x: obj.x + 20,
+ y: obj.y + 20,
+ id: nanoid(),
+ columns: (obj.columns ?? []).map((c) => ({ ...c, id: nanoid() })),
+ joins: (obj.joins ?? []).map((j) => ({ ...j, id: nanoid() })),
+ conditions: (obj.conditions ?? []).map((c) => ({
+ ...c,
+ id: nanoid(),
+ })),
+ },
+ index: views.length,
+ });
+ } else if (v.validate(obj, tableSchema).valid) {
addTable({
table: {
...obj,
@@ -962,6 +1066,7 @@ export default function ControlPanel({
references: relationships,
notes,
areas,
+ views,
pan: transform.pan,
zoom: transform.zoom,
...(databases[database].hasEnums && { enums }),
@@ -1021,6 +1126,7 @@ export default function ControlPanel({
references: relationships,
notes,
areas,
+ views,
pan: transform.pan,
zoom: transform.zoom,
...(databases[database].hasEnums && { enums }),
@@ -1141,6 +1247,7 @@ export default function ControlPanel({
relationships: relationships,
notes: notes,
subjectAreas: areas,
+ views: views,
custom: 1,
templateId: uuidv4(),
...(databases[database].hasEnums && { enums: enums }),
@@ -1176,6 +1283,7 @@ export default function ControlPanel({
setNotes([]);
setTypes([]);
setEnums([]);
+ setViews([]);
setUndoStack([]);
setRedoStack([]);
setGistId("");
@@ -1278,6 +1386,7 @@ export default function ControlPanel({
references: relationships,
types: types,
database: database,
+ views: views,
});
setExportData((prev) => ({
...prev,
@@ -1295,6 +1404,7 @@ export default function ControlPanel({
references: relationships,
types: types,
database: database,
+ views: views,
});
setExportData((prev) => ({
...prev,
@@ -1312,6 +1422,7 @@ export default function ControlPanel({
references: relationships,
types: types,
database: database,
+ views: views,
});
setExportData((prev) => ({
...prev,
@@ -1329,6 +1440,7 @@ export default function ControlPanel({
references: relationships,
types: types,
database: database,
+ views: views,
});
setExportData((prev) => ({
...prev,
@@ -1346,6 +1458,7 @@ export default function ControlPanel({
references: relationships,
types: types,
database: database,
+ views: views,
});
setExportData((prev) => ({
...prev,
@@ -1364,6 +1477,7 @@ export default function ControlPanel({
references: relationships,
types: types,
database: database,
+ views: views,
});
setExportData((prev) => ({
...prev,
@@ -1383,6 +1497,7 @@ export default function ControlPanel({
types: types,
database: database,
enums: enums,
+ views: views,
});
setExportData((prev) => ({
...prev,
@@ -1449,6 +1564,7 @@ export default function ControlPanel({
relationships: relationships,
notes: notes,
subjectAreas: areas,
+ views: views,
database: database,
...(databases[database].hasTypes && { types: types }),
...(databases[database].hasEnums && { enums: enums }),
@@ -1531,6 +1647,7 @@ export default function ControlPanel({
relationships: relationships,
notes: notes,
subjectAreas: areas,
+ views: views,
database: database,
title: title,
...(databases[database].hasTypes && { types: types }),
@@ -1576,6 +1693,7 @@ export default function ControlPanel({
setNotes([]);
setEnums([]);
setTypes([]);
+ setViews([]);
setUndoStack([]);
setRedoStack([]);
},
@@ -2083,6 +2201,15 @@ export default function ControlPanel({
<IconAddTable />
</button>
</Tooltip>
+ <Tooltip content={t("add_view")} position="bottom">
+ <button
+ className="flex items-center py-1 px-2 hover-2 rounded-sm disabled:opacity-50"
+ onClick={() => addView()}
+ disabled={layout.readOnly}
+ >
+ <IconAddView />
+ </button>
+ </Tooltip>
<Tooltip content={t("add_area")} position="bottom">
<button
className="py-1 px-2 hover-2 rounded-sm flex items-center disabled:opacity-50"
diff --git a/src/components/EditorHeader/Modal/ImportDiagram.jsx b/src/components/EditorHeader/Modal/ImportDiagram.jsx
index b38eb344..cd99844a 100644
--- a/src/components/EditorHeader/Modal/ImportDiagram.jsx
+++ b/src/components/EditorHeader/Modal/ImportDiagram.jsx
@@ -10,6 +10,7 @@ import {
useNotes,
useDiagram,
useTypes,
+ useViews,
} from "../../../hooks";
import { useTranslation } from "react-i18next";
import { fromDBML } from "../../../utils/importFrom/dbml";
@@ -25,6 +26,7 @@ export default function ImportDiagram({
const { tables, relationships, database } = useDiagram();
const { types } = useTypes();
const { enums } = useEnums();
+ const { views } = useViews();
const { t } = useTranslation();
const diagramIsEmpty = () => {
@@ -34,7 +36,8 @@ export default function ImportDiagram({
notes.length === 0 &&
areas.length === 0 &&
types.length === 0 &&
- enums.length === 0
+ enums.length === 0 &&
+ views.length === 0
);
};
diff --git a/src/components/EditorHeader/Modal/Modal.jsx b/src/components/EditorHeader/Modal/Modal.jsx
index 149549d3..f6fa1dac 100644
--- a/src/components/EditorHeader/Modal/Modal.jsx
+++ b/src/components/EditorHeader/Modal/Modal.jsx
@@ -23,6 +23,7 @@ import {
useTransform,
useTypes,
useUndoRedo,
+ useViews,
} from "../../../hooks";
import { isRtl } from "../../../i18n/utils/rtl";
import { useExtensions } from "../../../context/ExtensionsContext";
@@ -72,6 +73,7 @@ export default function Modal({
const { setAreas } = useAreas();
const { setTypes } = useTypes();
const { setEnums } = useEnums();
+ const { setViews } = useViews();
const { setTransform } = useTransform();
const { setUndoStack, setRedoStack } = useUndoRedo();
const { settings, setSettings } = useSettings();
@@ -105,6 +107,7 @@ export default function Modal({
setRelationships(importData.relationships);
setAreas(importData.subjectAreas ?? []);
setNotes(importData.notes ?? []);
+ setViews(importData.views ?? []);
if (importData.title) {
setTitle(importData.title);
}
@@ -169,6 +172,7 @@ export default function Modal({
setTransform((prev) => ({ ...prev, pan: { x: 0, y: 0 } }));
setNotes([]);
setAreas([]);
+ setViews([]);
} else {
setTables((prev) => [...prev, ...diagramData.tables]);
setRelationships((prev) =>
diff --git a/src/components/EditorHeader/Modal/Share.jsx b/src/components/EditorHeader/Modal/Share.jsx
index aaba844c..fa6d0523 100644
--- a/src/components/EditorHeader/Modal/Share.jsx
+++ b/src/components/EditorHeader/Modal/Share.jsx
@@ -10,6 +10,7 @@ import {
useNotes,
useTransform,
useTypes,
+ useViews,
} from "../../../hooks";
import { databases } from "../../../data/databases";
import { MODAL } from "../../../data/constants";
@@ -27,6 +28,7 @@ export default function Share({ title, setModal }) {
const { areas } = useAreas();
const { types } = useTypes();
const { enums } = useEnums();
+ const { views } = useViews();
const { transform } = useTransform();
const [error, setError] = useState(null);
@@ -74,6 +76,7 @@ export default function Share({ title, setModal }) {
relationships: relationships,
notes: notes,
subjectAreas: areas,
+ views: views,
database: database,
...(databases[database].hasTypes && { types: types }),
...(databases[database].hasEnums && { enums: enums }),
@@ -89,6 +92,7 @@ export default function Share({ title, setModal }) {
title,
enums,
types,
+ views,
transform,
]);
diff --git a/src/components/EditorHeader/SideSheet/Versions.jsx b/src/components/EditorHeader/SideSheet/Versions.jsx
index d0b13094..47aa350f 100644
--- a/src/components/EditorHeader/SideSheet/Versions.jsx
+++ b/src/components/EditorHeader/SideSheet/Versions.jsx
@@ -21,6 +21,7 @@ import {
useNotes,
useTransform,
useTypes,
+ useViews,
} from "../../../hooks";
import { databases } from "../../../data/databases";
import { loadCache, saveCache } from "../../../utils/cache";
@@ -38,6 +39,7 @@ export default function Versions({ open, title, setTitle }) {
const { notes, setNotes } = useNotes();
const { types, setTypes } = useTypes();
const { enums, setEnums } = useEnums();
+ const { views, setViews } = useViews();
const { transform } = useTransform();
const { t, i18n } = useTranslation();
const [isLoading, setIsLoading] = useState(false);
@@ -58,6 +60,7 @@ export default function Versions({ open, title, setTitle }) {
relationships: relationships,
notes: notes,
subjectAreas: areas,
+ views: views,
database: database,
...(databases[database].hasTypes && { types: types }),
...(databases[database].hasEnums && { enums: enums }),
@@ -72,6 +75,7 @@ export default function Versions({ open, title, setTitle }) {
title,
enums,
types,
+ views,
transform,
]);
@@ -99,6 +103,7 @@ export default function Versions({ open, title, setTitle }) {
setRelationships(parsedDiagram.relationships);
setAreas(parsedDiagram.subjectAreas);
setNotes(parsedDiagram.notes);
+ setViews(parsedDiagram.views ?? []);
setTitle(parsedDiagram.title);
if (databases[database].hasTypes) {
@@ -126,6 +131,7 @@ export default function Versions({ open, title, setTitle }) {
setNotes,
setTypes,
setEnums,
+ setViews,
setTitle,
],
);
@@ -192,6 +198,7 @@ export default function Versions({ open, title, setTitle }) {
relationships: relationships,
notes: notes,
subjectAreas: areas,
+ views: views,
database: database,
...(databases[database].hasTypes && { types: types }),
...(databases[database].hasEnums && { enums: enums }),
diff --git a/src/components/EditorSidePanel/Issues.jsx b/src/components/EditorSidePanel/Issues.jsx
index 3090a307..0c9c8fd7 100644
--- a/src/components/EditorSidePanel/Issues.jsx
+++ b/src/components/EditorSidePanel/Issues.jsx
@@ -2,7 +2,13 @@ import { useState, useEffect } from "react";
import { Collapse, Badge } from "@douyinfe/semi-ui";
import { arrayIsEqual } from "../../utils/utils";
import { getIssues } from "../../utils/issues";
-import { useEnums, useSettings, useDiagram, useTypes } from "../../hooks";
+import {
+ useEnums,
+ useSettings,
+ useDiagram,
+ useTypes,
+ useViews,
+} from "../../hooks";
import { useTranslation } from "react-i18next";
export default function Issues({ dbmlProblems = [] }) {
@@ -10,6 +16,7 @@ export default function Issues({ dbmlProblems = [] }) {
const { t } = useTranslation();
const { settings } = useSettings();
const { enums } = useEnums();
+ const { views } = useViews();
const { tables, relationships, database } = useDiagram();
const [issues, setIssues] = useState([]);
@@ -21,6 +28,7 @@ export default function Issues({ dbmlProblems = [] }) {
types: types,
database: database,
enums: enums,
+ views: views,
});
if (!arrayIsEqual(newIssues, issues)) {
@@ -29,7 +37,7 @@ export default function Issues({ dbmlProblems = [] }) {
};
findIssues();
- }, [tables, relationships, issues, types, database, enums]);
+ }, [tables, relationships, issues, types, database, enums, views]);
const badgeCount = settings.strictMode
? dbmlProblems.length || null
diff --git a/src/components/EditorSidePanel/SidePanel.jsx b/src/components/EditorSidePanel/SidePanel.jsx
index 7b2d6a3c..7efeb842 100644
--- a/src/components/EditorSidePanel/SidePanel.jsx
+++ b/src/components/EditorSidePanel/SidePanel.jsx
@@ -1,6 +1,6 @@
import { useMemo, useState } from "react";
import { Tabs, TabPane } from "@douyinfe/semi-ui";
-import { IconCode, IconList } from "@douyinfe/semi-icons";
+import { IconCode, IconEyeOpened, IconList } from "@douyinfe/semi-icons";
import { IconTable, IconRelationship } from "../../icons";
import { Tab } from "../../data/constants";
import {
@@ -12,6 +12,7 @@ import {
useEnums,
useTypes,
useSettings,
+ useViews,
} from "../../hooks";
import { useTranslation } from "react-i18next";
import RelationshipsTab from "./RelationshipsTab/RelationshipsTab";
@@ -20,6 +21,7 @@ import Issues from "./Issues";
import AreasTab from "./AreasTab/AreasTab";
import NotesTab from "./NotesTab/NotesTab";
import TablesTab from "./TablesTab/TablesTab";
+import ViewsTab from "./ViewsTab/ViewsTab";
import { databases } from "../../data/databases";
import EnumsTab from "./EnumsTab/EnumsTab";
import { isRtl } from "../../i18n/utils/rtl";
@@ -35,6 +37,7 @@ export default function SidePanel({ width, resize, setResize }) {
const { notesCount } = useNotes();
const { typesCount } = useTypes();
const { enumsCount } = useEnums();
+ const { viewsCount } = useViews();
const { t } = useTranslation();
const [dbmlProblems, setDbmlProblems] = useState([]);
@@ -45,6 +48,11 @@ export default function SidePanel({ width, resize, setResize }) {
itemKey: Tab.TABLES,
component: <TablesTab />,
},
+ {
+ tab: `${t("views")} (${viewsCount})`,
+ itemKey: Tab.VIEWS,
+ component: <ViewsTab />,
+ },
{
tab: `${t("relationships")} (${relationshipsCount})`,
itemKey: Tab.RELATIONSHIPS,
@@ -83,6 +91,7 @@ export default function SidePanel({ width, resize, setResize }) {
t,
database,
tablesCount,
+ viewsCount,
relationshipsCount,
areasCount,
typesCount,
@@ -141,6 +150,10 @@ export default function SidePanel({ width, resize, setResize }) {
<IconRelationship />
<span>{relationshipsCount}</span>
</div>
+ <div className="flex items-center gap-1.5" title={t("views")}>
+ <IconEyeOpened />
+ <span>{viewsCount}</span>
+ </div>
</div>
<div className="segmented-bg inline-flex items-center p-0.5 rounded-sm text-xs">
<button
diff --git a/src/components/EditorSidePanel/ViewsTab/SearchBar.jsx b/src/components/EditorSidePanel/ViewsTab/SearchBar.jsx
new file mode 100644
index 00000000..061dce05
--- /dev/null
+++ b/src/components/EditorSidePanel/ViewsTab/SearchBar.jsx
@@ -0,0 +1,41 @@
+import { useState } from "react";
+import { AutoComplete } from "@douyinfe/semi-ui";
+import { IconSearch } from "@douyinfe/semi-icons";
+import { useViews } from "../../../hooks";
+import { useTranslation } from "react-i18next";
+
+export default function SearchBar() {
+ const { views } = useViews();
+ const [value, setValue] = useState("");
+ const { t } = useTranslation();
+
+ const [filteredResult, setFilteredResult] = useState(
+ views.map((v) => v.name),
+ );
+
+ const handleStringSearch = (value) => {
+ setFilteredResult(
+ views.map((v) => v.name).filter((i) => i.includes(value)),
+ );
+ };
+
+ return (
+ <AutoComplete
+ data={filteredResult}
+ value={value}
+ showClear
+ prefix={<IconSearch />}
+ placeholder={t("search")}
+ onSearch={(v) => handleStringSearch(v)}
+ emptyContent={<div className="p-3 popover-theme">{t("not_found")}</div>}
+ onChange={(v) => setValue(v)}
+ onSelect={(v) => {
+ const view = views.find((e) => e.name === v);
+ document
+ .getElementById(`scroll_view_${view.id}`)
+ ?.scrollIntoView({ behavior: "smooth" });
+ }}
+ className="w-full"
+ />
+ );
+}
diff --git a/src/components/EditorSidePanel/ViewsTab/ViewCondition.jsx b/src/components/EditorSidePanel/ViewsTab/ViewCondition.jsx
new file mode 100644
index 00000000..a7e569c0
--- /dev/null
+++ b/src/components/EditorSidePanel/ViewsTab/ViewCondition.jsx
@@ -0,0 +1,91 @@
+import { Select, Input, Button } from "@douyinfe/semi-ui";
+import { IconDeleteStroked } from "@douyinfe/semi-icons";
+import { useDiagram, useLayout } from "../../../hooks";
+import {
+ ConditionOperator,
+ operatorTakesValue,
+ viewColumnOptions,
+} from "../../../utils/views";
+import { useTranslation } from "react-i18next";
+
+export default function ViewCondition({
+ view,
+ condition,
+ first,
+ onChange,
+ onDelete,
+}) {
+ const { tables } = useDiagram();
+ const { layout } = useLayout();
+ const { t } = useTranslation();
+ const takesValue = operatorTakesValue(condition.operator);
+
+ return (
+ <div className="py-2 border-b border-color last:border-b-0">
+ <div className="flex items-center gap-2">
+ {first ? (
+ <div className="w-[84px] shrink-0" />
+ ) : (
+ <Select
+ style={{ width: 84 }}
+ value={condition.connector ?? "AND"}
+ disabled={layout.readOnly}
+ optionList={[
+ { label: "AND", value: "AND" },
+ { label: "OR", value: "OR" },
+ ]}
+ onChange={(connector) => onChange({ ...condition, connector })}
+ />
+ )}
+ <Select
+ className="flex-1 min-w-0"
+ placeholder={t("column")}
+ filter
+ disabled={layout.readOnly}
+ validateStatus={condition.fieldId ? "default" : "error"}
+ value={
+ condition.fieldId
+ ? `${condition.tableId}:${condition.fieldId}`
+ : null
+ }
+ optionList={viewColumnOptions(view, tables)}
+ onChange={(value) => {
+ const [tableId, fieldId] = value.split(":");
+ onChange({ ...condition, tableId, fieldId });
+ }}
+ />
+ <Button
+ type="danger"
+ theme="borderless"
+ disabled={layout.readOnly}
+ icon={<IconDeleteStroked />}
+ onClick={onDelete}
+ />
+ </div>
+ <div className="flex items-center gap-2 mt-2">
+ <div className="w-[84px] shrink-0" />
+ <Select
+ className={takesValue ? "shrink-0" : "flex-1 min-w-0"}
+ style={takesValue ? { width: 96 } : undefined}
+ value={condition.operator}
+ disabled={layout.readOnly}
+ optionList={Object.values(ConditionOperator).map((value) => ({
+ label: value,
+ value,
+ }))}
+ onChange={(operator) => onChange({ ...condition, operator })}
+ />
+ {takesValue && (
+ <Input
+ className="flex-1 min-w-0"
+ placeholder={t("value")}
+ readonly={layout.readOnly}
+ value={condition.value}
+ onChange={(value) => onChange({ ...condition, value })}
+ />
+ )}
+ <div className="w-8 shrink-0" />
+ </div>
+ </div>
+ );
+}
diff --git a/src/components/EditorSidePanel/ViewsTab/ViewInfo.jsx b/src/components/EditorSidePanel/ViewsTab/ViewInfo.jsx
new file mode 100644
index 00000000..688211db
--- /dev/null
+++ b/src/components/EditorSidePanel/ViewsTab/ViewInfo.jsx
@@ -0,0 +1,422 @@
+import { useRef, useState } from "react";
+import {
+ Button,
+ Card,
+ Checkbox,
+ Collapse,
+ Input,
+ Select,
+ TextArea,
+} from "@douyinfe/semi-ui";
+import { IconDeleteStroked, IconPlus } from "@douyinfe/semi-icons";
+import { nanoid } from "nanoid";
+import ColorPicker from "../ColorPicker";
+import ViewJoin from "./ViewJoin";
+import ViewOutputColumn from "./ViewOutputColumn";
+import ViewCondition from "./ViewCondition";
+import { SortableList } from "../../SortableList/SortableList";
+import {
+ useDiagram,
+ useLayout,
+ useSaveState,
+ useUndoRedo,
+ useViews,
+} from "../../../hooks";
+import { Action, ObjectType, State } from "../../../data/constants";
+import { databases } from "../../../data/databases";
+import {
+ ConditionOperator,
+ JoinType,
+ suggestJoinCondition,
+} from "../../../utils/views";
+import { useTranslation } from "react-i18next";
+
+function Section({ title, count, action, children }) {
+ return (
+ <div className="mt-4">
+ <div className="flex items-center justify-between gap-2 mb-1">
+ <div className="text-md font-semibold break-keep whitespace-nowrap">
+ {title} <span className="font-normal">({count})</span>
+ </div>
+ <div className="flex items-center justify-end min-w-0">{action}</div>
+ </div>
+ {children}
+ </div>
+ );
+}
+
+export default function ViewInfo({ data }) {
+ const { t } = useTranslation();
+ const { layout } = useLayout();
+ const { database, tables, relationships } = useDiagram();
+ const { updateView, deleteView, setViews } = useViews();
+ const { setUndoStack, setRedoStack } = useUndoRedo();
+ const { setSaveState } = useSaveState();
+ const [editField, setEditField] = useState({});
+ const [showComment, setShowComment] = useState(false);
+ const [commentActiveKey, setCommentActiveKey] = useState("");
+ const initialColorRef = useRef(data.color);
+
+ const pushEdit = (undo, redo, extra) => {
+ setUndoStack((prev) => [
+ ...prev,
+ {
+ action: Action.EDIT,
+ element: ObjectType.VIEW,
+ component: "self",
+ vid: data.id,
+ undo,
+ redo,
+ message: t("edit_view", { viewName: data.name, extra }),
+ },
+ ]);
+ setRedoStack([]);
+ };
+
+ const commit = (patch, extra) => {
+ const undo = Object.fromEntries(
+ Object.keys(patch).map((key) => [key, data[key]]),
+ );
+ pushEdit(undo, patch, extra);
+ updateView(data.id, patch);
+ };
+
+ const handleColorPick = (color) => {
+ setUndoStack((prev) => {
+ let undoColor = initialColorRef.current;
+ const lastColorChange = prev.findLast(
+ (e) =>
+ e.element === ObjectType.VIEW &&
+ e.vid === data.id &&
+ e.action === Action.EDIT &&
+ e.redo?.color,
+ );
+ if (lastColorChange) undoColor = lastColorChange.redo.color;
+ if (color === undoColor) return prev;
+
+ return [
+ ...prev,
+ {
+ action: Action.EDIT,
+ element: ObjectType.VIEW,
+ component: "self",
+ vid: data.id,
+ undo: { color: undoColor },
+ redo: { color },
+ message: t("edit_view", { viewName: data.name, extra: "[color]" }),
+ },
+ ];
+ });
+ setRedoStack([]);
+ };
+
+ const setBaseTable = (baseTableId) => {
+ commit(
+ {
+ baseTableId,
+ joins: [],
+ columns: [],
+ conditions: [],
+ },
+ "[base table]",
+ );
+ };
+
+ const addJoin = () => {
+ commit(
+ {
+ joins: [
+ ...data.joins,
+ { id: nanoid(), type: JoinType.INNER, tableId: null, on: null },
+ ],
+ },
+ "[add join]",
+ );
+ };
+
+ const changeJoin = (next) => {
+ const withSuggestion =
+ next.tableId && !next.on
+ ? {
+ ...next,
+ on: suggestJoinCondition(data, tables, relationships, next.tableId),
+ }
+ : next;
+
+ commit(
+ { joins: data.joins.map((j) => (j.id === next.id ? withSuggestion : j)) },
+ "[join]",
+ );
+ };
+
+ const addColumn = () => {
+ commit(
+ {
+ columns: [
+ ...data.columns,
+ { id: nanoid(), tableId: null, fieldId: null, alias: "" },
+ ],
+ },
+ "[add column]",
+ );
+ };
+
+ const addCondition = () => {
+ commit(
+ {
+ conditions: [
+ ...data.conditions,
+ {
+ id: nanoid(),
+ connector: "AND",
+ tableId: null,
+ fieldId: null,
+ operator: ConditionOperator.EQ,
+ value: "",
+ },
+ ],
+ },
+ "[add condition]",
+ );
+ };
+
+ return (
+ <div>
+ <div className="flex items-center mb-3">
+ <div className="text-md font-semibold break-keep">{t("name")}:</div>
+ <Input
+ value={data.name}
+ validateStatus={data.name.trim() === "" ? "error" : "default"}
+ placeholder={t("name")}
+ className="ms-2"
+ readonly={layout.readOnly}
+ onChange={(value) => updateView(data.id, { name: value })}
+ onFocus={(e) => setEditField({ name: e.target.value })}
+ onBlur={(e) => {
+ if (e.target.value === editField.name) return;
+ pushEdit(editField, { name: e.target.value }, "[name]");
+ }}
+ />
+ </div>
+
+ <div className="text-md font-semibold break-keep mb-1">
+ {t("base_table")}
+ </div>
+ <Select
+ className="w-full"
+ placeholder={t("select_a_table")}
+ filter
+ disabled={layout.readOnly}
+ validateStatus={data.baseTableId ? "default" : "error"}
+ value={data.baseTableId}
+ optionList={tables.map((tb) => ({ label: tb.name, value: tb.id }))}
+ onChange={setBaseTable}
+ />
+
+ {databases[database].hasMaterializedViews && (
+ <Checkbox
+ className="mt-3 !flex w-full flex-row-reverse justify-between pe-2"
+ checked={!!data.materialized}
+ disabled={layout.readOnly}
+ onChange={(e) =>
+ commit({ materialized: e.target.checked }, "[materialized]")
+ }
+ >
+ {t("materialized")}
+ </Checkbox>
+ )}
+
+ <Section
+ title={t("joins")}
+ count={data.joins.length}
+ action={
+ <Button
+ theme="borderless"
+ icon={<IconPlus />}
+ title={t("add_join")}
+ aria-label={t("add_join")}
+ disabled={layout.readOnly || !data.baseTableId}
+ onClick={addJoin}
+ />
+ }
+ >
+ <SortableList
+ items={data.joins}
+ keyPrefix={`view-joins-${data.id}`}
+ onChange={(joins) =>
+ setViews((prev) =>
+ prev.map((v) => (v.id === data.id ? { ...v, joins } : v)),
+ )
+ }
+ afterChange={() => setSaveState(State.SAVING)}
+ renderItem={(join) => (
+ <ViewJoin
+ view={data}
+ join={join}
+ onChange={changeJoin}
+ onDelete={() =>
+ commit(
+ { joins: data.joins.filter((j) => j.id !== join.id) },
+ "[delete join]",
+ )
+ }
+ />
+ )}
+ />
+ </Section>
+
+ <Section
+ title={t("output_columns")}
+ count={data.columns.length}
+ action={
+ <Button
+ theme="borderless"
+ icon={<IconPlus />}
+ title={t("add_column")}
+ aria-label={t("add_column")}
+ disabled={layout.readOnly || !data.baseTableId}
+ onClick={addColumn}
+ />
+ }
+ >
+ <SortableList
+ items={data.columns}
+ keyPrefix={`view-${data.id}`}
+ onChange={(columns) =>
+ setViews((prev) =>
+ prev.map((v) => (v.id === data.id ? { ...v, columns } : v)),
+ )
+ }
+ afterChange={() => setSaveState(State.SAVING)}
+ renderItem={(column) => (
+ <ViewOutputColumn
+ view={data}
+ column={column}
+ onChange={(next) =>
+ commit(
+ {
+ columns: data.columns.map((c) =>
+ c.id === next.id ? next : c,
+ ),
+ },
+ "[column]",
+ )
+ }
+ onDelete={() =>
+ commit(
+ {
+ columns: data.columns.filter((c) => c.id !== column.id),
+ },
+ "[delete column]",
+ )
+ }
+ />
+ )}
+ />
+ </Section>
+
+ <Section
+ title={t("where")}
+ count={data.conditions.length}
+ action={
+ <Button
+ theme="borderless"
+ icon={<IconPlus />}
+ title={t("add_condition")}
+ aria-label={t("add_condition")}
+ disabled={layout.readOnly || !data.baseTableId}
+ onClick={addCondition}
+ />
+ }
+ >
+ {data.conditions.map((condition, index) => (
+ <ViewCondition
+ key={condition.id}
+ view={data}
+ condition={condition}
+ first={index === 0}
+ onChange={(next) =>
+ commit(
+ {
+ conditions: data.conditions.map((c) =>
+ c.id === next.id ? next : c,
+ ),
+ },
+ "[condition]",
+ )
+ }
+ onDelete={() =>
+ commit(
+ {
+ conditions: data.conditions.filter(
+ (c) => c.id !== condition.id,
+ ),
+ },
+ "[delete condition]",
+ )
+ }
+ />
+ ))}
+ </Section>
+
+ {((data.comment && data.comment.trim() !== "") || showComment) && (
+ <Card
+ bodyStyle={{ padding: "4px" }}
+ style={{ marginTop: "12px", marginBottom: "12px" }}
+ headerLine={false}
+ >
+ <Collapse
+ activeKey={commentActiveKey}
+ onChange={(itemKey) => setCommentActiveKey(itemKey)}
+ keepDOM={false}
+ lazyRender
+ accordion
+ >
+ <Collapse.Panel header={t("comment")} itemKey="1">
+ <TextArea
+ value={data.comment}
+ readonly={layout.readOnly}
+ autosize
+ rows={1}
+ placeholder={t("comment")}
+ onChange={(value) => updateView(data.id, { comment: value })}
+ onFocus={(e) => setEditField({ comment: e.target.value })}
+ onBlur={(e) => {
+ if (e.target.value === editField.comment) return;
+ pushEdit(editField, { comment: e.target.value }, "[comment]");
+ }}
+ />
+ </Collapse.Panel>
+ </Collapse>
+ </Card>
+ )}
+
+ <div className="flex justify-between items-center gap-1 mt-5 mb-2">
+ <ColorPicker
+ usePopover={true}
+ readOnly={layout.readOnly}
+ value={data.color}
+ onChange={(color) => updateView(data.id, { color })}
+ onColorPick={handleColorPick}
+ />
+ <div className="flex gap-1">
+ <Button
+ disabled={layout.readOnly}
+ onClick={() => {
+ setShowComment(true);
+ setCommentActiveKey("1");
+ }}
+ >
+ {t("add_comment")}
+ </Button>
+ <Button
+ type="danger"
+ disabled={layout.readOnly}
+ icon={<IconDeleteStroked />}
+ onClick={() => deleteView(data.id)}
+ />
+ </div>
+ </div>
+ </div>
+ );
+}
diff --git a/src/components/EditorSidePanel/ViewsTab/ViewJoin.jsx b/src/components/EditorSidePanel/ViewsTab/ViewJoin.jsx
new file mode 100644
index 00000000..54544416
--- /dev/null
+++ b/src/components/EditorSidePanel/ViewsTab/ViewJoin.jsx
@@ -0,0 +1,150 @@
+import { useState } from "react";
+import { Select, Button } from "@douyinfe/semi-ui";
+import { IconChevronDown, IconDeleteStroked } from "@douyinfe/semi-icons";
+import { useDiagram, useLayout } from "../../../hooks";
+import { JoinType } from "../../../utils/views";
+import { DragHandle } from "../../SortableList/DragHandle";
+import { useTranslation } from "react-i18next";
+
+export default function ViewJoin({ view, join, onChange, onDelete }) {
+ const { tables } = useDiagram();
+ const { layout } = useLayout();
+ const { t } = useTranslation();
+ const [expanded, setExpanded] = useState(false);
+
+ const joinTable = tables.find((tb) => tb.id === join.tableId);
+ const complete = Boolean(join.on?.leftFieldId && join.on?.rightFieldId);
+ const showOn = Boolean(joinTable) && (expanded || !complete);
+
+ const precedingJoins = view.joins.slice(
+ 0,
+ view.joins.findIndex((j) => j.id === join.id),
+ );
+ const leftScope = [view.baseTableId, ...precedingJoins.map((j) => j.tableId)]
+ .filter(Boolean)
+ .map((id) => tables.find((tb) => tb.id === id))
+ .filter(Boolean);
+
+ const leftOptions = leftScope.flatMap((table) =>
+ table.fields.map((field) => ({
+ label: `${table.name}.${field.name}`,
+ value: `${table.id}:${field.id}`,
+ })),
+ );
+
+ return (
+ <div className="py-2 border-b border-color last:border-b-0">
+ <div className="flex items-center gap-2">
+ <div className="w-5 shrink-0 flex justify-center -mt-1.5">
+ <DragHandle readOnly={layout.readOnly} id={join.id} />
+ </div>
+ <Select
+ style={{ width: 88 }}
+ value={join.type}
+ disabled={layout.readOnly}
+ optionList={Object.values(JoinType).map((value) => ({
+ label: value,
+ value,
+ }))}
+ onChange={(type) => onChange({ ...join, type })}
+ />
+ <Select
+ className="flex-1 min-w-0"
+ placeholder={t("select_a_table")}
+ value={join.tableId}
+ filter
+ disabled={layout.readOnly}
+ validateStatus={join.tableId ? "default" : "error"}
+ optionList={tables.map((tb) => ({ label: tb.name, value: tb.id }))}
+ onChange={(tableId) => onChange({ ...join, tableId, on: null })}
+ />
+ <div className="flex items-center shrink-0">
+ <Button
+ theme="borderless"
+ type="tertiary"
+ title={t("join_condition")}
+ disabled={!joinTable || !complete}
+ icon={
+ <IconChevronDown
+ className={`transition-transform duration-200 ease-out ${
+ showOn ? "rotate-180" : ""
+ }`}
+ />
+ }
+ onClick={() => setExpanded((prev) => !prev)}
+ />
+ <Button
+ type="danger"
+ theme="borderless"
+ disabled={layout.readOnly}
+ icon={<IconDeleteStroked />}
+ onClick={onDelete}
+ />
+ </div>
+ </div>
+
+ <div
+ inert={showOn ? undefined : ""}
+ className={`grid transition-[grid-template-rows,opacity] duration-200 ease-out ${
+ showOn ? "grid-rows-[1fr] opacity-100" : "grid-rows-[0fr] opacity-0"
+ }`}
+ >
+ <div className="overflow-hidden">
+ {joinTable && (
+ <div className="space-y-2 pt-2">
+ <div className="flex items-center gap-2">
+ <div className="w-5 shrink-0" />
+ <span className="w-[88px] shrink-0 text-center opacity-60">
+ ON
+ </span>
+ <Select
+ className="flex-1 min-w-0"
+ placeholder={t("column")}
+ filter
+ disabled={layout.readOnly}
+ validateStatus={join.on?.leftFieldId ? "default" : "error"}
+ value={
+ join.on?.leftFieldId
+ ? `${join.on.leftTableId}:${join.on.leftFieldId}`
+ : null
+ }
+ optionList={leftOptions}
+ onChange={(value) => {
+ const [leftTableId, leftFieldId] = value.split(":");
+ onChange({
+ ...join,
+ on: { ...join.on, leftTableId, leftFieldId },
+ });
+ }}
+ />
+ <div className="w-16 shrink-0" />
+ </div>
+ <div className="flex items-center gap-2">
+ <div className="w-5 shrink-0" />
+ <span className="w-[88px] shrink-0 text-center opacity-60">
+ =
+ </span>
+ <Select
+ className="flex-1 min-w-0"
+ placeholder={t("column")}
+ filter
+ disabled={layout.readOnly}
+ validateStatus={join.on?.rightFieldId ? "default" : "error"}
+ value={join.on?.rightFieldId ?? null}
+ optionList={joinTable.fields.map((field) => ({
+ label: `${joinTable.name}.${field.name}`,
+ value: field.id,
+ }))}
+ onChange={(rightFieldId) =>
+ onChange({ ...join, on: { ...join.on, rightFieldId } })
+ }
+ />
+ <div className="w-16 shrink-0" />
+ </div>
+ </div>
+ )}
+ </div>
+ </div>
+ </div>
+ );
+}
diff --git a/src/components/EditorSidePanel/ViewsTab/ViewOutputColumn.jsx b/src/components/EditorSidePanel/ViewsTab/ViewOutputColumn.jsx
new file mode 100644
index 00000000..4f2f9f56
--- /dev/null
+++ b/src/components/EditorSidePanel/ViewsTab/ViewOutputColumn.jsx
@@ -0,0 +1,49 @@
+import { Select, Input, Button } from "@douyinfe/semi-ui";
+import { IconDeleteStroked } from "@douyinfe/semi-icons";
+import { useDiagram, useLayout } from "../../../hooks";
+import { viewColumnOptions } from "../../../utils/views";
+import { DragHandle } from "../../SortableList/DragHandle";
+import { useTranslation } from "react-i18next";
+
+export default function ViewOutputColumn({ view, column, onChange, onDelete }) {
+ const { tables } = useDiagram();
+ const { layout } = useLayout();
+ const { t } = useTranslation();
+
+ const options = viewColumnOptions(view, tables);
+
+ return (
+ <div className="flex items-center gap-2 py-2 border-b border-color last:border-b-0">
+ <div className="w-5 shrink-0 flex justify-center -mt-1.5">
+ <DragHandle readOnly={layout.readOnly} id={column.id} />
+ </div>
+ <Select
+ className="flex-1 min-w-0"
+ placeholder={t("column")}
+ filter
+ disabled={layout.readOnly}
+ validateStatus={column.fieldId ? "default" : "error"}
+ value={column.fieldId ? `${column.tableId}:${column.fieldId}` : null}
+ optionList={options}
+ onChange={(value) => {
+ const [tableId, fieldId] = value.split(":");
+ onChange({ ...column, tableId, fieldId });
+ }}
+ />
+ <Input
+ style={{ width: 104 }}
+ placeholder={t("alias")}
+ readonly={layout.readOnly}
+ value={column.alias}
+ onChange={(alias) => onChange({ ...column, alias })}
+ />
+ <Button
+ type="danger"
+ theme="borderless"
+ disabled={layout.readOnly}
+ icon={<IconDeleteStroked />}
+ onClick={onDelete}
+ />
+ </div>
+ );
+}
diff --git a/src/components/EditorSidePanel/ViewsTab/ViewsTab.jsx b/src/components/EditorSidePanel/ViewsTab/ViewsTab.jsx
new file mode 100644
index 00000000..0699eb01
--- /dev/null
+++ b/src/components/EditorSidePanel/ViewsTab/ViewsTab.jsx
@@ -0,0 +1,115 @@
+import { Collapse, Button } from "@douyinfe/semi-ui";
+import { IconPlus, IconEyeOpened, IconEyeClosed } from "@douyinfe/semi-icons";
+import { useLayout, useSelect, useUndoRedo, useViews } from "../../../hooks";
+import { Action, ObjectType } from "../../../data/constants";
+import { useTranslation } from "react-i18next";
+import SearchBar from "./SearchBar";
+import Empty from "../Empty";
+import ViewInfo from "./ViewInfo";
+
+export default function ViewsTab() {
+ const { views, addView } = useViews();
+ const { selectedElement, setSelectedElement } = useSelect();
+ const { layout } = useLayout();
+ const { t } = useTranslation();
+
+ return (
+ <>
+ <div className="flex gap-2">
+ <SearchBar />
+ <div>
+ <Button
+ block
+ icon={<IconPlus />}
+ onClick={() => addView()}
+ disabled={layout.readOnly}
+ >
+ {t("add_view")}
+ </Button>
+ </div>
+ </div>
+ {views.length === 0 ? (
+ <Empty title={t("no_views")} text={t("no_views_text")} />
+ ) : (
+ <Collapse
+ activeKey={
+ selectedElement.open && selectedElement.element === ObjectType.VIEW
+ ? `${selectedElement.id}`
+ : ""
+ }
+ keepDOM={false}
+ lazyRender
+ onChange={(k) =>
+ setSelectedElement((prev) => ({
+ ...prev,
+ open: true,
+ id: k[0],
+ element: ObjectType.VIEW,
+ }))
+ }
+ accordion
+ >
+ {views.map((view) => (
+ <ViewListItem key={view.id} view={view} />
+ ))}
+ </Collapse>
+ )}
+ </>
+ );
+}
+
+function ViewListItem({ view }) {
+ const { updateView } = useViews();
+ const { setUndoStack, setRedoStack } = useUndoRedo();
+ const { t } = useTranslation();
+
+ const toggleViewVisibility = (e) => {
+ e.stopPropagation();
+ setUndoStack((prev) => [
+ ...prev,
+ {
+ action: Action.EDIT,
+ element: ObjectType.VIEW,
+ component: "self",
+ vid: view.id,
+ undo: { hidden: view.hidden },
+ redo: { hidden: !view.hidden },
+ message: t("edit_view", { viewName: view.name, extra: "[hidden]" }),
+ },
+ ]);
+ setRedoStack([]);
+ updateView(view.id, { hidden: !view.hidden });
+ };
+
+ return (
+ <div id={`scroll_view_${view.id}`}>
+ <Collapse.Panel
+ className="relative"
+ header={
+ <div className="flex items-center justify-between w-full">
+ <div className="flex items-center gap-2 flex-1 min-w-0">
+ <div className="overflow-hidden text-ellipsis whitespace-nowrap">
+ {view.name}
+ </div>
+ </div>
+ <Button
+ size="small"
+ theme="borderless"
+ type="tertiary"
+ onClick={toggleViewVisibility}
+ icon={view.hidden ? <IconEyeClosed /> : <IconEyeOpened />}
+ className="me-2"
+ />
+ <div
+ className="w-1 h-full absolute top-0 left-0 bottom-0"
+ style={{ backgroundColor: view.color }}
+ />
+ </div>
+ }
+ itemKey={`${view.id}`}
+ >
+ <ViewInfo data={view} />
+ </Collapse.Panel>
+ </div>
+ );
+}
diff --git a/src/components/Workspace.jsx b/src/components/Workspace.jsx
index a0c05000..6f347d6f 100644
--- a/src/components/Workspace.jsx
+++ b/src/components/Workspace.jsx
@@ -26,6 +26,7 @@ import {
useTypes,
useSaveState,
useEnums,
+ useViews,
useNavigateWithParams,
} from "../hooks";
import FloatingControls from "./FloatingControls";
@@ -77,6 +78,7 @@ export default function WorkSpace({ forcedDiagramId } = {}) {
const { saveState, setSaveState } = useSaveState();
const { transform, setTransform } = useTransform();
const { enums, setEnums } = useEnums();
+ const { views, setViews } = useViews();
const {
tables,
relationships,
@@ -117,6 +119,7 @@ export default function WorkSpace({ forcedDiagramId } = {}) {
references: relationships,
notes,
areas,
+ views,
pan: transform.pan,
zoom: transform.zoom,
...(databases[database].hasEnums && { enums }),
@@ -130,6 +133,7 @@ export default function WorkSpace({ forcedDiagramId } = {}) {
relationships,
notes,
areas,
+ views,
transform,
enums,
types,
@@ -181,6 +185,7 @@ export default function WorkSpace({ forcedDiagramId } = {}) {
references: relationships,
notes: notes,
areas: areas,
+ views: views,
pan: transform.pan,
zoom: transform.zoom,
loadedFromGistId: loadedFromGistId,
@@ -204,6 +209,7 @@ export default function WorkSpace({ forcedDiagramId } = {}) {
references: relationships,
notes: notes,
areas: areas,
+ views: views,
gistId: gistId ?? "",
pan: transform.pan,
zoom: transform.zoom,
@@ -227,6 +233,7 @@ export default function WorkSpace({ forcedDiagramId } = {}) {
relationships,
notes,
areas,
+ views,
types,
title,
transform,
@@ -305,6 +312,7 @@ export default function WorkSpace({ forcedDiagramId } = {}) {
setTransform({ pan: diagram.pan, zoom: diagram.zoom });
setTypes(diagram.types ?? []);
setEnums(diagram.enums ?? []);
+ setViews(diagram.views ?? []);
};
const resetEditorState = () => {
@@ -314,6 +322,7 @@ export default function WorkSpace({ forcedDiagramId } = {}) {
setNotes([]);
setTypes([]);
setEnums([]);
+ setViews([]);
setUndoStack([]);
setRedoStack([]);
setTransform({ zoom: 1, pan: { x: 0, y: 0 } });
@@ -378,6 +387,7 @@ export default function WorkSpace({ forcedDiagramId } = {}) {
setRedoStack([]);
setTypes(template.types ?? []);
setEnums(template.enums ?? []);
+ setViews(template.views ?? []);
};
const loadFromGist = async (shareId, diagramId = null) => {
@@ -398,6 +408,7 @@ export default function WorkSpace({ forcedDiagramId } = {}) {
setTransform(parsed.transform);
setTypes(parsed.types ?? []);
setEnums(parsed.enums ?? []);
+ setViews(parsed.views ?? []);
if (parsed.customTypes) mergeCustomTypes(parsed.customTypes);
if (diagramId) {
navigate(`/editor/diagrams/${diagramId}`, { replace: true });
@@ -448,6 +459,7 @@ export default function WorkSpace({ forcedDiagramId } = {}) {
setTypes,
setDatabase,
setEnums,
+ setViews,
selectedDb,
setSaveState,
setLayout,
@@ -470,6 +482,7 @@ export default function WorkSpace({ forcedDiagramId } = {}) {
tables?.length === 0 &&
areas?.length === 0 &&
notes?.length === 0 &&
+ views?.length === 0 &&
types?.length === 0
)
return;
@@ -484,6 +497,7 @@ export default function WorkSpace({ forcedDiagramId } = {}) {
tables?.length,
areas?.length,
notes?.length,
+ views?.length,
types?.length,
relationships?.length,
transform.zoom,
diff --git a/src/context/ViewsContext.jsx b/src/context/ViewsContext.jsx
new file mode 100644
index 00000000..e226c19f
--- /dev/null
+++ b/src/context/ViewsContext.jsx
@@ -0,0 +1,135 @@
+import { createContext, useState } from "react";
+import { Action, ObjectType, defaultBlue } from "../data/constants";
+import { useTransform, useUndoRedo, useSelect, useCollab } from "../hooks";
+import { Toast } from "@douyinfe/semi-ui";
+import { useTranslation } from "react-i18next";
+import { nanoid } from "nanoid";
+
+export const ViewsContext = createContext(null);
+
+export default function ViewsContextProvider({ children }) {
+ const { t } = useTranslation();
+ const [views, setViews] = useState([]);
+ const { transform } = useTransform();
+ const { setUndoStack, setRedoStack } = useUndoRedo();
+ const { selectedElement, setSelectedElement } = useSelect();
+ const { emitDelta, isApplyingRemoteRef } = useCollab();
+
+ const shouldEmit = () => !isApplyingRemoteRef?.current;
+
+ const addView = (data, addToHistory = true) => {
+ const id = nanoid();
+ const newView = {
+ id,
+ name: `view_${views.length}`,
+ x: transform.pan.x,
+ y: transform.pan.y,
+ baseTableId: null,
+ joins: [],
+ columns: [],
+ conditions: [],
+ comment: "",
+ materialized: false,
+ color: defaultBlue,
+ locked: false,
+ };
+ if (data) {
+ setViews((prev) => {
+ const temp = prev.slice();
+ temp.splice(data.index ?? prev.length, 0, data.view);
+ return temp;
+ });
+ } else {
+ setViews((prev) => [...prev, newView]);
+ }
+ if (addToHistory) {
+ setUndoStack((prev) => [
+ ...prev,
+ {
+ action: Action.ADD,
+ element: ObjectType.VIEW,
+ data: data || { view: newView, index: views.length },
+ message: t("add_view"),
+ },
+ ]);
+ setRedoStack([]);
+ }
+ if (shouldEmit()) {
+ const created = data?.view ?? newView;
+ emitDelta({
+ target: "view",
+ action: "create",
+ entityId: created.id,
+ data: [created],
+ });
+ }
+ };
+
+ const deleteView = (id, addToHistory = true) => {
+ const index = views.findIndex((v) => v.id === id);
+ if (index === -1) return;
+
+ if (addToHistory) {
+ Toast.success(t("view_deleted"));
+ setUndoStack((prev) => [
+ ...prev,
+ {
+ action: Action.DELETE,
+ element: ObjectType.VIEW,
+ data: { view: views[index], index },
+ message: t("delete_view", { viewName: views[index].name }),
+ },
+ ]);
+ setRedoStack([]);
+ }
+ setViews((prev) => prev.filter((v) => v.id !== id));
+ if (
+ selectedElement.element === ObjectType.VIEW &&
+ selectedElement.id === id
+ ) {
+ setSelectedElement((prev) => ({
+ ...prev,
+ element: ObjectType.NONE,
+ id: -1,
+ open: false,
+ }));
+ }
+ if (shouldEmit()) {
+ emitDelta({
+ target: "view",
+ action: "delete",
+ entityId: id,
+ data: [id],
+ });
+ }
+ };
+
+ const updateView = (id, updatedValues) => {
+ setViews((prev) =>
+ prev.map((v) => (v.id === id ? { ...v, ...updatedValues } : v)),
+ );
+ if (shouldEmit()) {
+ emitDelta({
+ target: "view",
+ action: "update",
+ entityId: id,
+ data: [id, updatedValues],
+ });
+ }
+ };
+
+ return (
+ <ViewsContext.Provider
+ value={{
+ views,
+ setViews,
+ addView,
+ updateView,
+ deleteView,
+ viewsCount: views.length,
+ }}
+ >
+ {children}
+ </ViewsContext.Provider>
+ );
+}
diff --git a/src/data/constants.js b/src/data/constants.js
index 81b51a91..0b87c8ce 100644
--- a/src/data/constants.js
+++ b/src/data/constants.js
@@ -48,6 +48,7 @@ export const Tab = {
NOTES: "4",
TYPES: "5",
ENUMS: "6",
+ VIEWS: "7",
};
export const ObjectType = {
@@ -59,6 +60,7 @@ export const ObjectType = {
TYPE: 5,
ENUM: 6,
DBML: 7,
+ VIEW: 8,
};
export const Action = {
diff --git a/src/data/databases.js b/src/data/databases.js
index 43c9b2a8..41221299 100644
--- a/src/data/databases.js
+++ b/src/data/databases.js
@@ -23,6 +23,7 @@ export const databases = new Proxy(
hasTypes: true,
hasEnums: true,
hasArrays: true,
+ hasMaterializedViews: true,
},
[DB.SQLITE]: {
name: "SQLite",
@@ -50,6 +51,7 @@ export const databases = new Proxy(
hasTypes: false,
hasEnums: false,
hasArrays: false,
+ hasMaterializedViews: true,
beta: true,
},
[DB.GENERIC]: {
@@ -58,6 +60,7 @@ export const databases = new Proxy(
image: null,
description: i18n.t("generic_description"),
hasTypes: true,
+ hasMaterializedViews: true,
},
},
{ get: (target, prop) => (prop in target ? target[prop] : {}) },
diff --git a/src/data/schemas.js b/src/data/schemas.js
index 4972b4df..00e9844e 100644
--- a/src/data/schemas.js
+++ b/src/data/schemas.js
@@ -147,6 +147,69 @@ export const enumSchema = {
},
};
+export const viewSchema = {
+ type: "object",
+ properties: {
+ id: { type: ["integer", "string"] },
+ name: { type: "string" },
+ x: { type: "number" },
+ y: { type: "number" },
+ baseTableId: { type: ["string", "integer", "null"] },
+ joins: {
+ type: "array",
+ items: {
+ type: "object",
+ properties: {
+ id: { type: ["integer", "string"] },
+ type: { type: "string" },
+ tableId: { type: ["string", "integer", "null"] },
+ on: {
+ type: ["object", "null"],
+ properties: {
+ leftTableId: { type: ["string", "integer"] },
+ leftFieldId: { type: ["string", "integer"] },
+ rightFieldId: { type: ["string", "integer"] },
+ },
+ },
+ },
+ required: ["type"],
+ },
+ },
+ columns: {
+ type: "array",
+ items: {
+ type: "object",
+ properties: {
+ id: { type: ["integer", "string"] },
+ tableId: { type: ["string", "integer", "null"] },
+ fieldId: { type: ["string", "integer", "null"] },
+ alias: { type: "string" },
+ },
+ },
+ },
+ conditions: {
+ type: "array",
+ items: {
+ type: "object",
+ properties: {
+ id: { type: ["integer", "string"] },
+ connector: { type: "string" },
+ tableId: { type: ["string", "integer", "null"] },
+ fieldId: { type: ["string", "integer", "null"] },
+ operator: { type: "string" },
+ value: { type: ["string", "number"] },
+ },
+ },
+ },
+ comment: { type: "string" },
+ materialized: { type: "boolean" },
+ locked: { type: "boolean" },
+ hidden: { type: "boolean" },
+ color: { type: "string", pattern: "^#[0-9a-fA-F]{6}$" },
+ },
+ required: ["id", "name", "x", "y", "joins", "columns", "color"],
+};
+
export const customTypeEntrySchema = {
type: "object",
properties: {
@@ -207,6 +270,10 @@ export const jsonSchema = {
type: "array",
items: { ...enumSchema },
},
+ views: {
+ type: "array",
+ items: { ...viewSchema },
+ },
title: { type: "string" },
database: { type: "string" },
},
diff --git a/src/hooks/index.js b/src/hooks/index.js
index c80b631a..6c93cea4 100644
--- a/src/hooks/index.js
+++ b/src/hooks/index.js
@@ -11,6 +11,7 @@ export { default as useTransform } from "./useTransform";
export { default as useTypes } from "./useTypes";
export { default as useUndoRedo } from "./useUndoRedo";
export { default as useEnums } from "./useEnums";
+export { default as useViews } from "./useViews";
export { default as useThemedPage } from "./useThemedPage";
export { default as useNavigateWithParams } from "./useNavigateWithParams";
export { default as useCollab } from "./useCollab";
diff --git a/src/hooks/useViews.js b/src/hooks/useViews.js
new file mode 100644
index 00000000..802a425f
--- /dev/null
+++ b/src/hooks/useViews.js
@@ -0,0 +1,6 @@
+import { useContext } from "react";
+import { ViewsContext } from "../context/ViewsContext";
+
+export default function useViews() {
+ return useContext(ViewsContext);
+}
diff --git a/src/i18n/locales/en.js b/src/i18n/locales/en.js
index e047c62e..ab31fa63 100644
--- a/src/i18n/locales/en.js
+++ b/src/i18n/locales/en.js
@@ -323,6 +323,41 @@ const en = {
foreign_key: "Foreign key",
import_with_ai: "Import with AI",
ai_import_failed: "AI import failed. Please try again.",
+ views: "Views",
+ add_view: "Add view",
+ edit_view: "{{extra}} Edit view {{viewName}}",
+ delete_view: "Delete view",
+ view_deleted: "View deleted",
+ no_views: "No views",
+ no_views_text: "Build SQL views from your tables",
+ materialized: "Materialized",
+ join_condition: "Join condition",
+ base_table: "Base table",
+ select_a_table: "Select a table",
+ joins: "Joins",
+ add_join: "Add join",
+ output_columns: "Output columns",
+ add_column: "Add column",
+ add_condition: "Add condition",
+ alias: "Alias",
+ column: "Column",
+ value: "Value",
+ where: "Where",
+ view_w_no_name: "View with no name",
+ view_w_no_base_table: "View '{{viewName}}' has no base table",
+ duplicate_views: "Duplicate views with the name '{{viewName}}'",
+ view_name_clashes_w_table:
+ "View '{{viewName}}' has the same name as a table",
+ join_w_no_table: "Join with no table in view '{{viewName}}'",
+ join_w_no_condition:
+ "Join on '{{tableName}}' in view '{{viewName}}' has no condition",
+ join_out_of_order:
+ "Join on '{{tableName}}' in view '{{viewName}}' references a table joined after it",
+ empty_view_column: "Empty output column in view '{{viewName}}'",
+ duplicate_view_columns:
+ "Duplicate output column '{{columnName}}' in view '{{viewName}}'",
+ lock: "Lock",
+ unlock: "Unlock",
edit_dbml: "Edit DBML",
dbml_problem: "Ln {{line}}, Col {{column}}: {{message}}",
},
diff --git a/src/icons/IconAddView.jsx b/src/icons/IconAddView.jsx
new file mode 100644
index 00000000..e53c97ea
--- /dev/null
+++ b/src/icons/IconAddView.jsx
@@ -0,0 +1,19 @@
+export default function IconAddView() {
+ return (
+ <svg height="26" width="26">
+ <path
+ fill="none"
+ stroke="currentColor"
+ strokeWidth="2"
+ strokeDasharray="4,3"
+ d="M4 2 L20 2 A4 4 0 0 1 22 4 L22 14 M14 22 L4 22 A4 4 0 0 1 1 18 L1 4 A4 4 0 0 1 5 2 M1 8 L22 8"
+ />
+ <path
+ fill="none"
+ stroke="currentColor"
+ strokeWidth="2"
+ d="M22 17 L22 25 M18 21 L26 21"
+ />
+ </svg>
+ );
+}
diff --git a/src/icons/index.js b/src/icons/index.js
index 9c394373..d2815dcb 100644
--- a/src/icons/index.js
+++ b/src/icons/index.js
@@ -1,4 +1,5 @@
export { default as IconAddTable } from "./IconAddTable";
+export { default as IconAddView } from "./IconAddView";
export { default as IconTable } from "./IconTable";
export { default as IconRelationship } from "./IconRelationship";
export { default as IconAddArea } from "./IconAddArea";
diff --git a/src/pages/Editor.jsx b/src/pages/Editor.jsx
index 519e9c65..337753db 100644
--- a/src/pages/Editor.jsx
+++ b/src/pages/Editor.jsx
@@ -9,6 +9,7 @@ import TypesContextProvider from "../context/TypesContext";
import SettingsContextProvider from "../context/SettingsContext";
import SaveStateContextProvider from "../context/SaveStateContext";
import EnumsContextProvider from "../context/EnumsContext";
+import ViewsContextProvider from "../context/ViewsContext";
import WorkSpace from "../components/Workspace";
import { useThemedPage } from "../hooks";
@@ -25,11 +26,13 @@ export default function Editor() {
<NotesContextProvider>
<TypesContextProvider>
<EnumsContextProvider>
- <TablesContextProvider>
- <SaveStateContextProvider>
- <WorkSpace />
- </SaveStateContextProvider>
- </TablesContextProvider>
+ <ViewsContextProvider>
+ <TablesContextProvider>
+ <SaveStateContextProvider>
+ <WorkSpace />
+ </SaveStateContextProvider>
+ </TablesContextProvider>
+ </ViewsContextProvider>
</EnumsContextProvider>
</TypesContextProvider>
</NotesContextProvider>
diff --git a/src/utils/exportAs/documentation.js b/src/utils/exportAs/documentation.js
index 28cb3a60..47133dec 100644
--- a/src/utils/exportAs/documentation.js
+++ b/src/utils/exportAs/documentation.js
@@ -1,4 +1,5 @@
import { dbToTypes } from "../../data/datatypes";
+import { buildViewSQL, resolveViewColumns } from "../views";
import { jsonToMermaid } from "./mermaid";
import { databases } from "../../data/databases";
import { getRelationshipFields } from "../utils";
@@ -130,13 +131,36 @@ export function jsonToDocumentation(obj) {
.join("\n")
: "";
+ const views = obj.views ?? [];
+ const documentationViews = views.length
+ ? views
+ .map((view) => {
+ const columns = resolveViewColumns(view, obj.tables);
+ const columnsTable = columns.length
+ ? formatMarkdownTable(
+ ["Name", "Type", "Source"],
+ columns.map((c) => [c.name, c.type ?? "", c.source ?? ""]),
+ )
+ : "";
+ const sql = buildViewSQL(view, obj.tables, obj.database);
+ return (
+ `### ${view.name}${view.materialized ? " (materialized)" : ""}\n\n` +
+ `${view.comment ? `${view.comment}\n\n` : ""}` +
+ `${columnsTable}${columnsTable ? "\n" : ""}` +
+ `${sql ? `\`\`\`sql\n${sql}\n\`\`\`\n` : ""}`
+ );
+ })
+ .join("\n")
+ : "";
+
return (
`# ${obj.title} documentation\n## Summary\n\n- [Introduction](#introduction)\n- [Database Type](#database-type)\n` +
- `- [Table Structure](#table-structure)\n${documentationSummary}\n- [Relationships](#relationships)\n- [Database Diagram](#database-diagram)\n\n` +
+ `- [Table Structure](#table-structure)\n${documentationSummary}\n- [Relationships](#relationships)\n${views.length > 0 ? `- [Views](#views)\n` : ""}- [Database Diagram](#database-diagram)\n\n` +
`## Introduction\n\n## Database type\n\n- **Database system:** ` +
`${databases[obj.database].name}\n## Table structure\n\n${documentationEntities}` +
`\n## Relationships\n\n${documentationRelationships}\n` +
`${databases[obj.database].hasTypes && obj.types.length > 0 ? `## Types\n\n` + documentationTypes + `\n\n` : ""}` +
+ `${views.length > 0 ? `## Views\n\n` + documentationViews + `\n` : ""}` +
`## Database Diagram\n\n\`\`\`mermaid\n${jsonToMermaid(obj)}\n\`\`\``
);
}
diff --git a/src/utils/exportSQL/generic.js b/src/utils/exportSQL/generic.js
index 9b313357..f83890bf 100644
--- a/src/utils/exportSQL/generic.js
+++ b/src/utils/exportSQL/generic.js
@@ -1,4 +1,5 @@
import { DB } from "../../data/constants";
+import { appendViews } from "../views";
import { dbToTypes, defaultTypes } from "../../data/datatypes";
import {
escapeQuotes,
@@ -189,7 +190,7 @@ export function getTypeString(
}
}
-export function jsonToMySQL(obj) {
+function tablesToMySQL(obj) {
return `${obj.tables
.map(
(table) =>
@@ -255,7 +256,7 @@ export function jsonToMySQL(obj) {
.join("\n")}`;
}
-export function jsonToPostgreSQL(obj) {
+function tablesToPostgreSQL(obj) {
const typeStatements = obj.types
.map((type) => {
const enumStatements = type.fields
@@ -412,7 +413,7 @@ export function getSQLiteType(field) {
}
}
-export function jsonToSQLite(obj) {
+function tablesToSQLite(obj) {
return obj.tables
.map((table) => {
const inlineFK = getInlineFK(table, obj);
@@ -453,7 +454,7 @@ export function jsonToSQLite(obj) {
.join("\n");
}
-export function jsonToMariaDB(obj) {
+function tablesToMariaDB(obj) {
return `${obj.tables
.map(
(table) =>
@@ -521,7 +522,7 @@ export function jsonToMariaDB(obj) {
.join("\n")}`;
}
-export function jsonToSQLServer(obj) {
+function tablesToSQLServer(obj) {
return `${obj.types
.map((type) => {
return `${
@@ -597,7 +598,7 @@ export function jsonToSQLServer(obj) {
.join("\n")}`;
}
-export function jsonToOracleSQL(obj) {
+function tablesToOracleSQL(obj) {
return `${obj.tables
.map(
(table) =>
@@ -673,3 +674,27 @@ export function jsonToOracleSQL(obj) {
})
.join("\n")}`;
}
+
+export function jsonToMySQL(obj) {
+ return appendViews(tablesToMySQL(obj), obj, DB.MYSQL);
+}
+
+export function jsonToPostgreSQL(obj) {
+ return appendViews(tablesToPostgreSQL(obj), obj, DB.POSTGRES);
+}
+
+export function jsonToSQLite(obj) {
+ return appendViews(tablesToSQLite(obj), obj, DB.SQLITE);
+}
+
+export function jsonToMariaDB(obj) {
+ return appendViews(tablesToMariaDB(obj), obj, DB.MARIADB);
+}
+
+export function jsonToSQLServer(obj) {
+ return appendViews(tablesToSQLServer(obj), obj, DB.MSSQL);
+}
+
+export function jsonToOracleSQL(obj) {
+ return appendViews(tablesToOracleSQL(obj), obj, DB.ORACLESQL);
+}
diff --git a/src/utils/exportSQL/mariadb.js b/src/utils/exportSQL/mariadb.js
index 2d9929b8..72b81bc8 100644
--- a/src/utils/exportSQL/mariadb.js
+++ b/src/utils/exportSQL/mariadb.js
@@ -1,3 +1,4 @@
+import { appendViews } from "../views";
import {
escapeQuotes,
parseDefault,
@@ -25,7 +26,7 @@ function parseType(field) {
return res;
}
-export function toMariaDB(diagram) {
+function tablesToMariaDB(diagram) {
return `${diagram.tables
.map(
(table) =>
@@ -84,3 +85,7 @@ export function toMariaDB(diagram) {
})
.join("\n")}`;
}
+
+export function toMariaDB(diagram) {
+ return appendViews(tablesToMariaDB(diagram), diagram);
+}
diff --git a/src/utils/exportSQL/mssql.js b/src/utils/exportSQL/mssql.js
index 094bca02..3a8e3834 100644
--- a/src/utils/exportSQL/mssql.js
+++ b/src/utils/exportSQL/mssql.js
@@ -1,3 +1,4 @@
+import { appendViews } from "../views";
import {
parseDefault,
escapeQuotes,
@@ -36,7 +37,7 @@ GO
}
}
-export function toMSSQL(diagram) {
+function tablesToMSSQL(diagram) {
const tablesSql = diagram.tables
.map((table) => {
const fieldsSql = table.fields
@@ -125,3 +126,7 @@ GO`;
return `${tablesSql}\n${referencesSql}`;
}
+
+export function toMSSQL(diagram) {
+ return appendViews(tablesToMSSQL(diagram), diagram);
+}
diff --git a/src/utils/exportSQL/mysql.js b/src/utils/exportSQL/mysql.js
index 593ce729..c688f0b5 100644
--- a/src/utils/exportSQL/mysql.js
+++ b/src/utils/exportSQL/mysql.js
@@ -1,3 +1,4 @@
+import { appendViews } from "../views";
import {
escapeQuotes,
parseDefault,
@@ -25,7 +26,7 @@ function parseType(field) {
return res;
}
-export function toMySQL(diagram) {
+function tablesToMySQL(diagram) {
return `${diagram.tables
.map(
(table) =>
@@ -88,3 +89,7 @@ export function toMySQL(diagram) {
})
.join("\n")}`;
}
+
+export function toMySQL(diagram) {
+ return appendViews(tablesToMySQL(diagram), diagram);
+}
diff --git a/src/utils/exportSQL/oraclesql.js b/src/utils/exportSQL/oraclesql.js
index 10646a1f..82158513 100644
--- a/src/utils/exportSQL/oraclesql.js
+++ b/src/utils/exportSQL/oraclesql.js
@@ -1,3 +1,4 @@
+import { appendViews } from "../views";
import { dbToTypes } from "../../data/datatypes";
import {
parseDefault,
@@ -5,7 +6,7 @@ import {
getFkColumnNames,
} from "./shared";
-export function toOracleSQL(diagram) {
+function tablesToOracleSQL(diagram) {
return `${diagram.tables
.map(
(table) =>
@@ -69,3 +70,7 @@ export function toOracleSQL(diagram) {
})
.join("\n")}`;
}
+
+export function toOracleSQL(diagram) {
+ return appendViews(tablesToOracleSQL(diagram), diagram);
+}
diff --git a/src/utils/exportSQL/postgres.js b/src/utils/exportSQL/postgres.js
index ad1dbfac..87d7477b 100644
--- a/src/utils/exportSQL/postgres.js
+++ b/src/utils/exportSQL/postgres.js
@@ -1,3 +1,4 @@
+import { appendViews } from "../views";
import {
escapeQuotes,
exportFieldComment,
@@ -7,7 +8,7 @@ import {
} from "./shared";
import { dbToTypes } from "../../data/datatypes";
-export function toPostgres(diagram) {
+function tablesToPostgres(diagram) {
const enumStatements = diagram.enums
.map(
(e) =>
@@ -133,3 +134,7 @@ export function toPostgres(diagram) {
.filter(Boolean)
.join("\n\n");
}
+
+export function toPostgres(diagram) {
+ return appendViews(tablesToPostgres(diagram), diagram);
+}
diff --git a/src/utils/exportSQL/sqlite.js b/src/utils/exportSQL/sqlite.js
index 22bad263..3a4a77e1 100644
--- a/src/utils/exportSQL/sqlite.js
+++ b/src/utils/exportSQL/sqlite.js
@@ -1,3 +1,4 @@
+import { appendViews } from "../views";
import {
exportFieldComment,
getInlineFK,
@@ -7,7 +8,7 @@ import {
import { dbToTypes } from "../../data/datatypes";
-export function toSqlite(diagram) {
+function tablesToSqlite(diagram) {
return diagram.tables
.map((table) => {
const inlineFK = getInlineFK(table, diagram);
@@ -46,4 +47,8 @@ export function toSqlite(diagram) {
.join("\n")}`;
})
.join("\n");
-}
\ No newline at end of file
+}
+
+export function toSqlite(diagram) {
+ return appendViews(tablesToSqlite(diagram), diagram);
+}
diff --git a/src/utils/issues.js b/src/utils/issues.js
index 02892113..19988bec 100644
--- a/src/utils/issues.js
+++ b/src/utils/issues.js
@@ -219,6 +219,83 @@ export function getIssues(diagram) {
}
});
+ const duplicateViewNames = {};
+ const tableNames = new Set(diagram.tables.map((t) => t.name));
+ (diagram.views ?? []).forEach((view) => {
+ if (view.name === "") {
+ issues.push(i18n.t("view_w_no_name"));
+ return;
+ }
+
+ if (duplicateViewNames[view.name]) {
+ issues.push(i18n.t("duplicate_views", { viewName: view.name }));
+ } else {
+ duplicateViewNames[view.name] = true;
+ }
+
+ if (tableNames.has(view.name)) {
+ issues.push(i18n.t("view_name_clashes_w_table", { viewName: view.name }));
+ }
+
+ if (!view.baseTableId) {
+ issues.push(i18n.t("view_w_no_base_table", { viewName: view.name }));
+ return;
+ }
+
+ const joinScope = new Set([view.baseTableId]);
+ (view.joins ?? []).forEach((join) => {
+ if (!join.tableId) {
+ issues.push(i18n.t("join_w_no_table", { viewName: view.name }));
+ return;
+ }
+
+ const joined = diagram.tables.find((t) => t.id === join.tableId);
+ if (!join.on?.leftFieldId || !join.on?.rightFieldId) {
+ issues.push(
+ i18n.t("join_w_no_condition", {
+ viewName: view.name,
+ tableName: joined?.name ?? "",
+ }),
+ );
+ } else if (join.on.leftTableId && !joinScope.has(join.on.leftTableId)) {
+ issues.push(
+ i18n.t("join_out_of_order", {
+ viewName: view.name,
+ tableName: joined?.name ?? "",
+ }),
+ );
+ }
+
+ joinScope.add(join.tableId);
+ });
+
+ const duplicateViewColumns = {};
+ (view.columns ?? []).forEach((column) => {
+ if (!column.fieldId) {
+ issues.push(i18n.t("empty_view_column", { viewName: view.name }));
+ return;
+ }
+
+ const name =
+ column.alias?.trim() ||
+ diagram.tables
+ .find((t) => t.id === column.tableId)
+ ?.fields.find((f) => f.id === column.fieldId)?.name;
+ if (!name) return;
+
+ if (duplicateViewColumns[name]) {
+ issues.push(
+ i18n.t("duplicate_view_columns", {
+ viewName: view.name,
+ columnName: name,
+ }),
+ );
+ } else {
+ duplicateViewColumns[name] = true;
+ }
+ });
+ });
+
const duplicateFKName = {};
diagram.relationships.forEach((r) => {
if (duplicateFKName[r.name]) {
diff --git a/src/utils/views.js b/src/utils/views.js
new file mode 100644
index 00000000..c85c7f19
--- /dev/null
+++ b/src/utils/views.js
@@ -0,0 +1,281 @@
+import {
+ DB,
+ tableFieldHeight,
+ tableHeaderHeight,
+ tableColorStripHeight,
+} from "../data/constants";
+import {
+ getCommentHeight,
+ isFunction,
+ isKeyword,
+ strHasQuotes,
+ getRelationshipFields,
+} from "./utils";
+import { dbToTypes } from "../data/datatypes";
+
+export const JoinType = {
+ INNER: "INNER",
+ LEFT: "LEFT",
+ RIGHT: "RIGHT",
+ FULL: "FULL",
+};
+
+export const ConditionOperator = {
+ EQ: "=",
+ NEQ: "<>",
+ GT: ">",
+ GTE: ">=",
+ LT: "<",
+ LTE: "<=",
+ LIKE: "LIKE",
+ IN: "IN",
+ IS_NULL: "IS NULL",
+ IS_NOT_NULL: "IS NOT NULL",
+};
+
+const valuelessOperators = new Set([
+ ConditionOperator.IS_NULL,
+ ConditionOperator.IS_NOT_NULL,
+]);
+
+const quoteFor = {
+ [DB.MYSQL]: (s) => `\`${s}\``,
+ [DB.MARIADB]: (s) => `\`${s}\``,
+ [DB.MSSQL]: (s) => `[${s}]`,
+};
+
+const identifierQuote = (database) =>
+ quoteFor[database] ?? ((s) => `"${s}"`);
+
+export function operatorTakesValue(operator) {
+ return !valuelessOperators.has(operator);
+}
+
+export function viewTableIds(view) {
+ return [
+ view.baseTableId,
+ ...(view.joins ?? []).map((j) => j.tableId),
+ ].filter(Boolean);
+}
+
+export function viewScopeTables(view, tables = []) {
+ const byId = new Map(tables.map((t) => [t.id, t]));
+ return viewTableIds(view)
+ .map((id) => byId.get(id))
+ .filter(Boolean);
+}
+
+export function viewColumnOptions(view, tables = []) {
+ return viewScopeTables(view, tables).flatMap((table) =>
+ table.fields.map((field) => ({
+ label: `${table.name}.${field.name}`,
+ value: `${table.id}:${field.id}`,
+ tableId: table.id,
+ fieldId: field.id,
+ })),
+ );
+}
+
+function lookup(tables, tableId, fieldId) {
+ const table = tables.find((t) => t.id === tableId);
+ if (!table) return null;
+ const field = table.fields.find((f) => f.id === fieldId);
+ if (!field) return null;
+ return { table, field };
+}
+
+export function resolveViewColumns(view, tables = []) {
+ if (!view.baseTableId) return [];
+
+ const selected = view.columns ?? [];
+ if (selected.length === 0) {
+ return viewScopeTables(view, tables).flatMap((table) =>
+ table.fields.map((field) => ({
+ id: `${table.id}:${field.id}`,
+ name: field.name,
+ type: field.type,
+ size: field.size,
+ source: `${table.name}.${field.name}`,
+ })),
+ );
+ }
+
+ return selected
+ .map((column) => {
+ const resolved = lookup(tables, column.tableId, column.fieldId);
+ if (!resolved) return null;
+ const { table, field } = resolved;
+ return {
+ id: column.id,
+ name: column.alias?.trim() || field.name,
+ type: field.type,
+ size: field.size,
+ source: `${table.name}.${field.name}`,
+ };
+ })
+ .filter(Boolean);
+}
+
+export function suggestJoinCondition(view, tables, relationships, joinTableId) {
+ const scope = new Set(viewTableIds(view));
+ scope.delete(joinTableId);
+
+ for (const relationship of relationships) {
+ const pair = getRelationshipFields(relationship)[0];
+ if (!pair) continue;
+
+ const { startTableId, endTableId } = relationship;
+ if (startTableId === joinTableId && scope.has(endTableId)) {
+ return {
+ leftTableId: endTableId,
+ leftFieldId: pair.endFieldId,
+ rightFieldId: pair.startFieldId,
+ };
+ }
+ if (endTableId === joinTableId && scope.has(startTableId)) {
+ return {
+ leftTableId: startTableId,
+ leftFieldId: pair.startFieldId,
+ rightFieldId: pair.endFieldId,
+ };
+ }
+ }
+
+ return null;
+}
+
+function conditionValue(value, field, database) {
+ const raw = String(value ?? "").trim();
+ if (!raw) return "''";
+ if (strHasQuotes(raw) || isKeyword(raw) || isFunction(raw)) return raw;
+ if (raw.startsWith("(") && raw.endsWith(")")) return raw;
+ if (!dbToTypes[database]?.[field?.type]?.hasQuotes) return raw;
+ return `'${raw.replace(/'/g, "''")}'`;
+}
+
+export function buildViewSQL(view, tables = [], database = DB.GENERIC) {
+ if (!view.baseTableId) return "";
+
+ const quote = identifierQuote(database);
+ const baseTable = tables.find((t) => t.id === view.baseTableId);
+ if (!baseTable) return "";
+
+ const qualify = (tableId, fieldId) => {
+ const resolved = lookup(tables, tableId, fieldId);
+ if (!resolved) return null;
+ return `${quote(resolved.table.name)}.${quote(resolved.field.name)}`;
+ };
+
+ const selectList = (view.columns ?? [])
+ .map((column) => {
+ const qualified = qualify(column.tableId, column.fieldId);
+ if (!qualified) return null;
+ return column.alias?.trim()
+ ? `${qualified} AS ${quote(column.alias.trim())}`
+ : qualified;
+ })
+ .filter(Boolean);
+
+ const lines = [
+ selectList.length
+ ? `SELECT\n${selectList.map((c) => ` ${c}`).join(",\n")}`
+ : "SELECT *",
+ `FROM ${quote(baseTable.name)}`,
+ ];
+
+ for (const join of view.joins ?? []) {
+ const joinTable = tables.find((t) => t.id === join.tableId);
+ if (!joinTable) continue;
+
+ const left = join.on ? qualify(join.on.leftTableId, join.on.leftFieldId) : null;
+ const right = join.on ? qualify(join.tableId, join.on.rightFieldId) : null;
+ const onClause = left && right ? ` ON ${left} = ${right}` : "";
+ lines.push(`${join.type} JOIN ${quote(joinTable.name)}${onClause}`);
+ }
+
+ const conditions = (view.conditions ?? [])
+ .map((condition, index) => {
+ const resolved = lookup(tables, condition.tableId, condition.fieldId);
+ if (!resolved) return null;
+ const qualified = `${quote(resolved.table.name)}.${quote(resolved.field.name)}`;
+ const clause = operatorTakesValue(condition.operator)
+ ? `${qualified} ${condition.operator} ${conditionValue(condition.value, resolved.field, database)}`
+ : `${qualified} ${condition.operator}`;
+ return index === 0 ? clause : `${condition.connector ?? "AND"} ${clause}`;
+ })
+ .filter(Boolean);
+
+ if (conditions.length) {
+ lines.push(`WHERE ${conditions.join("\n ")}`);
+ }
+
+ return lines.join("\n");
+}
+
+const viewDialects = {
+ [DB.MYSQL]: { orReplace: true },
+ [DB.MARIADB]: { orReplace: true },
+ [DB.POSTGRES]: { orReplace: true, materialized: true, commentOn: true },
+ [DB.SQLITE]: { ifNotExists: true },
+ [DB.MSSQL]: { orAlter: true, batchSeparator: "\nGO" },
+ [DB.ORACLESQL]: { orReplace: true, materialized: true },
+ [DB.GENERIC]: { orReplace: true },
+};
+
+function viewStatement(view, body, dialect, quote) {
+ const materialized = view.materialized && dialect.materialized;
+ const keyword = materialized ? "MATERIALIZED VIEW" : "VIEW";
+ const prefix = materialized
+ ? "CREATE"
+ : dialect.orAlter
+ ? "CREATE OR ALTER"
+ : dialect.orReplace
+ ? "CREATE OR REPLACE"
+ : "CREATE";
+ const existsClause =
+ !materialized && dialect.ifNotExists ? " IF NOT EXISTS" : "";
+ const name = quote(view.name);
+
+ const statements = [];
+ if (view.comment?.trim() && !dialect.commentOn) {
+ statements.push(`/* ${view.comment} */`);
+ }
+ statements.push(`${prefix} ${keyword}${existsClause} ${name} AS\n${body};`);
+ if (view.comment?.trim() && dialect.commentOn) {
+ statements.push(
+ `COMMENT ON ${keyword} ${name} IS '${view.comment.replace(/'/g, "''")}';`,
+ );
+ }
+
+ return statements.join("\n") + (dialect.batchSeparator ?? "");
+}
+
+export function viewStatements(views, tables, database = DB.GENERIC) {
+ const dialect = viewDialects[database] ?? viewDialects[DB.GENERIC];
+ const quote = identifierQuote(database);
+
+ return (views ?? [])
+ .filter((v) => v.name?.trim())
+ .map((view) => {
+ const body = buildViewSQL(view, tables, database);
+ return body ? viewStatement(view, body, dialect, quote) : "";
+ })
+ .filter(Boolean)
+ .join("\n\n");
+}
+
+export function appendViews(sql, obj, database = obj?.database) {
+ const views = viewStatements(obj?.views, obj?.tables ?? [], database);
+ if (!views) return sql;
+
+ return sql.trimEnd() ? `${sql.trimEnd()}\n\n${views}` : views;
+}
+
+export function getViewHeight(view, columns, width, showComments = true) {
+ return (
+ columns.length * (tableFieldHeight + 1) +
+ tableHeaderHeight +
+ tableColorStripHeight +
+ getCommentHeight(view.comment, width, showComments)
+ );
+}