Free, simple, and intuitive online database diagram editor and SQL generator.
JavaScript databasedatabase-designdatabase-diagramdatabase-schemadbmldiagram-editoreditorer-diagramerderdiagramindexeddbmariadbmcporacle-databaseoracle-dbpostgresqlschema-designsqlsql-serversqlite
Add import from database (#1182)
1ilite1fa93b015a8
diff --git a/src/components/EditorHeader/ControlPanel.jsx b/src/components/EditorHeader/ControlPanel.jsxindex 648f56e2..2414d1d6 100644--- a/src/components/EditorHeader/ControlPanel.jsx+++ b/src/components/EditorHeader/ControlPanel.jsx@@ -22,6 +22,7 @@ import {Tooltip,Spin,Tag,+ Badge,Toast,Popconfirm,Typography,@@ -106,6 +107,7 @@ import {resolveViewColumns,} from "../../utils/views";import { autoArrange } from "../../utils/autoArrange";+import { schemaQueries } from "../../utils/importFrom/schemaQuery";import { findAutoFKRelationships } from "../../utils/autoRelationships";import { deleteFromCache, STORAGE_KEY } from "../../utils/cache";import { DateTime } from "luxon";@@ -124,6 +126,9 @@ export default function ControlPanel({lastSaved,setLastSaved,toolbarContainer,+ startWith,+ setStartWith,+ onBackToStart,}) {const { id: diagramId } = useParams();@@ -146,6 +151,29 @@ export default function ControlPanel({setModal(modalType);};const [importFrom, setImportFrom] = useState(IMPORT_FROM.JSON);++ const [openedFromStart, setOpenedFromStart] = useState(false);+ const [seenMenuTags, setSeenMenuTags] = useState(() => {+ try {+ return new Set(+ JSON.parse(localStorage.getItem("drawdb:seenMenuTags") || "[]"),+ );+ } catch {+ return new Set();+ }+ });++ useEffect(() => {+ if (!startWith) return;+ if (startWith.importFrom) setImportFrom(startWith.importFrom);+ setModal(startWith.modal);+ setOpenedFromStart(true);+ setStartWith(null);+ }, [startWith, setStartWith]);++ useEffect(() => {+ if (modal === MODAL.NONE) setOpenedFromStart(false);+ }, [modal]);const { saveState, setSaveState } = useSaveState();const { layout, setLayout } = useLayout();const { settings, setSettings } = useSettings();@@ -1189,7 +1217,7 @@ export default function ControlPanel({const menu = {file: {new: {- function: () => setModal(MODAL.NEW),+ function: () => window.open("/editor/templates/blank", "_blank"),},new_window: {function: () => window.open("/editor", "_blank"),@@ -1375,6 +1403,25 @@ export default function ControlPanel({},disabled: layout.readOnly,},+ import_from_database: {+ is_new: true,+ ...(database === DB.GENERIC && {+ children: Object.keys(schemaQueries).map((db) => ({+ function: () => {+ setModal(MODAL.IMPORT_DB);+ setImportDb(db);+ },+ name: databases[db].name,+ disabled: layout.readOnly,+ })),+ }),+ function: () => {+ if (database === DB.GENERIC) return;++ setModal(MODAL.IMPORT_DB);+ },+ disabled: layout.readOnly,+ },export_source: {...(database === DB.GENERIC && {children: [@@ -2053,6 +2100,15 @@ export default function ControlPanel({importFrom={importFrom}importDb={importDb}saveAsCopy={saveAsCopy}+ fitToView={fitToView}+ onBack={+ openedFromStart+ ? () => {+ setModal(MODAL.NONE);+ onBackToStart();+ }+ : undefined+ }/><Sidesheettype={sidesheet}@@ -2362,6 +2418,27 @@ export default function ControlPanel({<Dropdownkey={category}position="bottomLeft"+ onVisibleChange={(visible) => {+ const tagged = Object.keys(menu[category]).filter(+ (item) =>+ (menu[category][item].is_new ||+ menu[category][item].children?.some(+ (child) => child.is_new,+ )) &&+ !seenMenuTags.has(item),+ );+ if (visible || !tagged.length) return;+ const next = new Set([...seenMenuTags, ...tagged]);+ setSeenMenuTags(next);+ try {+ localStorage.setItem(+ "drawdb:seenMenuTags",+ JSON.stringify([...next]),+ );+ } catch {+ return;+ }+ }}style={{width: "240px",direction: isRtl(i18n.language) ? "rtl" : "ltr",@@ -2404,6 +2481,15 @@ export default function ControlPanel({{e.label}</Tag>)}+ {e.is_new && (+ <Tag+ size="small"+ color="blue"+ className="flex-shrink-0"+ >+ {t("new")}+ </Tag>+ )}</Dropdown.Item>);},@@ -2419,7 +2505,14 @@ export default function ControlPanel({}}onClick={menu[category][item].function}>- {t(item)}+ <span className="flex items-center gap-2">+ {t(item)}+ {menu[category][item].is_new && (+ <Tag size="small" color="blue">+ {t("new")}+ </Tag>+ )}+ </span>{isRtl(i18n.language) ? (<IconChevronLeft />@@ -2462,7 +2555,14 @@ export default function ControlPanel({}><div className="w-full flex items-center justify-between">- <div>{t(item)}</div>+ <div className="flex items-center gap-2">+ {t(item)}+ {menu[category][item].is_new && (+ <Tag size="small" color="blue">+ {t("new")}+ </Tag>+ )}+ </div><div className="flex items-center gap-1">{menu[category][item].shortcut && (<div className="text-gray-400">@@ -2480,7 +2580,24 @@ export default function ControlPanel({}><div className="px-3 py-1 hover-2 rounded-sm">- {t(category)}+ {Object.keys(menu[category]).some(+ (item) =>+ (menu[category][item].is_new ||+ menu[category][item].children?.some(+ (child) => child.is_new,+ )) &&+ !seenMenuTags.has(item),+ ) ? (+ <Badge+ dot+ type="primary"+ countStyle={{ right: -7, top: 5 }}+ >+ {t(category)}+ </Badge>+ ) : (+ t(category)+ )}</div></Dropdown>))}diff --git a/src/components/EditorHeader/Modal/ImportDatabase.jsx b/src/components/EditorHeader/Modal/ImportDatabase.jsxnew file mode 100644index 00000000..0a222304--- /dev/null+++ b/src/components/EditorHeader/Modal/ImportDatabase.jsx@@ -0,0 +1,189 @@+import {+ Banner,+ Button,+ Checkbox,+ TabPane,+ Tabs,+ Upload,+} from "@douyinfe/semi-ui";+import { Fragment, useState } from "react";+import { IconCopy, IconDownload, IconTickCircle } from "@douyinfe/semi-icons";+import { saveAs } from "file-saver";+import { useTranslation } from "react-i18next";+import { STATUS } from "../../../data/constants";+import { databases } from "../../../data/databases";+import {+ useAreas,+ useDiagram,+ useNotes,+ useSettings,+ useViews,+} from "../../../hooks";+import { schemaQueries } from "../../../utils/importFrom/schemaQuery";+import CodeEditor from "../../CodeEditor";++export default function ImportDatabase({+ importData,+ setImportData,+ error,+ setError,+ sourceDb,+}) {+ const { t } = useTranslation();+ const { query, minVersion, cli, note } = schemaQueries[sourceDb];+ const editorHeight = Math.max(320, window.innerHeight - 480);+ const { tables } = useDiagram();+ const { notes } = useNotes();+ const { areas } = useAreas();+ const { views } = useViews();+ const { settings } = useSettings();+ const [cliCopied, setCliCopied] = useState(false);+ const isEmpty =+ !tables.length && !notes.length && !areas.length && !views.length;++ const setSchema = (schema) => {+ setImportData((prev) => ({ ...prev, schema }));+ setError({ type: STATUS.NONE, message: "" });+ };++ return (+ <div className="space-y-1">+ <div className="text-sm">+ {t("schema_query_instructions", { database: databases[sourceDb].name })}+ <div className="opacity-70 mt-1">+ {t("requires_version", { version: minVersion })}+ {note && ` ${t(note)}`}+ </div>+ </div>+ <div className="grid grid-cols-2 gap-4">+ <Tabs>+ <TabPane tab={t("query")} itemKey="query">+ <CodeEditor+ height={editorHeight}+ language="sql"+ value={query}+ options={{ readOnly: true, minimap: { enabled: false } }}+ formatOnMount={false}+ showCopyButton+ extraControls={+ <Button+ icon={<IconDownload />}+ aria-label={t("download")}+ onClick={() =>+ saveAs(+ new Blob([query], { type: "text/plain" }),+ "drawdb-schema.sql",+ )+ }+ />+ }+ />+ </TabPane>+ </Tabs>+ <Tabs>+ <TabPane tab={t("paste_result")} itemKey="paste">+ <CodeEditor+ height={editorHeight}+ language="json"+ value={importData.schema}+ options={{ minimap: { enabled: false } }}+ formatOnMount={false}+ onChange={(value) => setSchema(value ?? "")}+ />+ </TabPane>+ <TabPane tab={t("upload_file")} itemKey="upload">+ <div+ className="flex flex-col gap-3"+ style={{ height: editorHeight }}+ >+ <div className="text-sm">+ <div className="mb-2">{t("schema_query_large")}</div>+ <div+ className={`flex items-center gap-3 rounded-lg border px-4 py-3 ${+ settings.mode === "dark"+ ? "border-zinc-800 bg-zinc-700"+ : "border-zinc-200 bg-zinc-100"+ }`}+ >+ <pre+ className={`min-w-0 flex-1 whitespace-pre-wrap font-mono text-sm ${+ settings.mode === "dark"+ ? "text-zinc-200"+ : "text-zinc-800"+ }`}+ >+ <span className="mr-2 select-none text-zinc-400">></span>+ {cli.split(" ").map((part, i) => (+ <Fragment key={i}>+ {i > 0 && " "}+ <span className="whitespace-nowrap">{part}</span>+ </Fragment>+ ))}+ </pre>+ <button+ type="button"+ aria-label={t("copy")}+ onClick={() =>+ navigator.clipboard.writeText(cli).then(() => {+ setCliCopied(true);+ setTimeout(() => setCliCopied(false), 1500);+ })+ }+ className={`inline-flex h-7 w-7 shrink-0 items-center justify-center rounded-md transition-colors ${+ settings.mode === "dark"+ ? "text-zinc-400 hover:bg-zinc-800 hover:text-zinc-200"+ : "text-zinc-500 hover:bg-zinc-200 hover:text-zinc-700"+ }`}+ >+ {cliCopied ? <IconTickCircle /> : <IconCopy />}+ </button>+ </div>+ </div>+ <Upload+ className="min-h-0 flex-1 !flex !flex-col !flex-nowrap [&_.semi-upload-drag-area]:min-h-0 [&_.semi-upload-drag-area]:flex-1 [&_.semi-upload-file-list]:!h-auto [&_.semi-upload-file-list]:!flex-none"+ action="#"+ beforeUpload={({ file, fileList }) => {+ const f = fileList[0].fileInstance;+ if (!f) return;+ const reader = new FileReader();+ reader.onload = (e) => setSchema(e.target.result);+ reader.readAsText(f);+ return {+ autoRemove: false,+ fileInstance: file.fileInstance,+ status: "success",+ shouldUpload: false,+ };+ }}+ draggable+ dragMainText={t("drag_and_drop_files")}+ dragSubText={t("upload_query_result")}+ accept=".json,.txt"+ onRemove={() => setSchema("")}+ limit={1}+ />+ </div>+ </TabPane>+ </Tabs>+ </div>+ {!isEmpty && (+ <Checkbox+ aria-label={t("overwrite_checkbox")}+ checked={importData.overwrite}+ onChange={(e) =>+ setImportData((prev) => ({ ...prev, overwrite: e.target.checked }))+ }+ >+ {t("overwrite_existing_diagram")}+ </Checkbox>+ )}+ {error.type === STATUS.ERROR && (+ <Banner+ type="danger"+ fullMode={false}+ description={<div>{error.message}</div>}+ />+ )}+ </div>+ );+}diff --git a/src/components/EditorHeader/Modal/Modal.jsx b/src/components/EditorHeader/Modal/Modal.jsxindex c347766f..ee015c14 100644--- a/src/components/EditorHeader/Modal/Modal.jsx+++ b/src/components/EditorHeader/Modal/Modal.jsx@@ -19,6 +19,7 @@ import {useEnums,useNavigateWithParams,useNotes,+ useSettings,useTransform,useTypes,useUndoRedo,@@ -27,6 +28,8 @@ import {import { isRtl } from "../../../i18n/utils/rtl";import { useExtensions } from "../../../context/ExtensionsContext";import { importSQL } from "../../../utils/importSQL";+import { fromSchemaQuery } from "../../../utils/importFrom/schemaQuery";+import { autoArrange } from "../../../utils/autoArrange";import {allowedTypesFor,normalizeAiDiagram,@@ -37,11 +40,11 @@ import {getOkText,} from "../../../utils/modalData";import CodeEditor from "../../CodeEditor";+import ImportDatabase from "./ImportDatabase";import ImportDiagram from "./ImportDiagram";import ImportSource from "./ImportSource";import ImportWithAiButton from "./ImportWithAiButton";import Language from "./Language";-import New from "./New";import Open from "./Open";import Rename from "./Rename";import Share from "./Share";@@ -64,6 +67,8 @@ export default function Modal({importDb,importFrom,saveAsCopy,+ fitToView,+ onBack,}) {const { t, i18n } = useTranslation();const { setTables, setRelationships, database, setSqlHeader } = useDiagram();@@ -74,12 +79,14 @@ export default function Modal({const { setViews } = useViews();const { setTransform } = useTransform();const { setUndoStack, setRedoStack } = useUndoRedo();+ const { settings } = useSettings();const [uncontrolledTitle, setUncontrolledTitle] = useState(title);const [uncontrolledLanguage, setUncontrolledLanguage] = useState(i18n.language,);const [importSource, setImportSource] = useState({src: "",+ schema: "",overwrite: false,});const [importData, setImportData] = useState(null);@@ -87,7 +94,6 @@ export default function Modal({type: STATUS.NONE,message: "",});- const [selectedTemplateId, setSelectedTemplateId] = useState(-1);const [selectedDiagramId, setSelectedDiagramId] = useState(0);const [saveAsTitle, setSaveAsTitle] = useState(title);const [aiImporting, setAiImporting] = useState(false);@@ -258,6 +264,57 @@ export default function Modal({case MODAL.IMPORT_SRC:parseSQLAndLoadDiagram();return;+ case MODAL.IMPORT_DB: {+ let imported;+ try {+ imported = fromSchemaQuery(importSource.schema, database);+ } catch (e) {+ setError({+ type: STATUS.ERROR,+ message: t(+ e.message === "truncated"+ ? "truncated_query_result"+ : "invalid_query_result",+ ),+ });+ return;+ }++ const positions = new Map(+ autoArrange(imported.tables, imported.relationships, settings).map(+ (p) => [p.id, p],+ ),+ );+ const tables = imported.tables.map((table) => ({+ ...table,+ x: positions.get(table.id).x,+ y: positions.get(table.id).y,+ }));++ applyImportedDiagram({ ...imported, tables });+ if (tables.length) fitToView(tables);++ const skipped = ["views", "indexes", "checks"]+ .filter((key) => imported.skipped[key] > 0)+ .map((key) =>+ t(`import_db_${key}`, { count: imported.skipped[key] }),+ );+ Toast.success({+ content: [+ t("import_db_summary", {+ tables: t("import_db_tables", { count: tables.length }),+ relationships: t("import_db_relationships", {+ count: imported.relationships.length,+ }),+ }),+ skipped.length+ ? t("import_db_skipped", { items: skipped.join(", ") })+ : "",+ ].join(" "),+ duration: 6,+ });+ return;+ }case MODAL.OPEN:if (!selectedDiagramId) return;navigate(`/editor/diagrams/${selectedDiagramId}`, "_blank");@@ -271,10 +328,6 @@ export default function Modal({await saveAsCopy(saveAsTitle);setModal(MODAL.NONE);return;- case MODAL.NEW:- window.open("/editor/templates/" + selectedTemplateId, "_blank");- setModal(MODAL.NONE);- return;case MODAL.LANGUAGE:i18n.changeLanguage(uncontrolledLanguage);setModal(MODAL.NONE);@@ -305,11 +358,14 @@ export default function Modal({setError={setError}/>);- case MODAL.NEW:+ case MODAL.IMPORT_DB:return (- <New- selectedTemplateId={selectedTemplateId}- setSelectedTemplateId={setSelectedTemplateId}+ <ImportDatabase+ importData={importSource}+ setImportData={setImportSource}+ error={error}+ setError={setError}+ sourceDb={database === DB.GENERIC ? importDb : database}/>);case MODAL.RENAME:@@ -396,15 +452,21 @@ export default function Modal({(modal === MODAL.RENAME && title === "") ||((modal === MODAL.IMG || modal === MODAL.CODE) && !exportData.data) ||(modal === MODAL.SAVEAS && saveAsTitle === "") ||- (modal === MODAL.IMPORT_SRC && importSource.src === "");+ (modal === MODAL.IMPORT_SRC && importSource.src === "") ||+ (modal === MODAL.IMPORT_DB && !importSource.schema.trim());const showAiFooter =modal === MODAL.IMPORT_SRC && typeof importSqlWithAi === "function";- const aiFooter = (+ const footer = (<div className="flex items-center justify-between">- <div>- {error.type === STATUS.ERROR && (+ <div className="flex items-center gap-2">+ {onBack && (+ <Button type="tertiary" onClick={onBack}>+ {t("back")}+ </Button>+ )}+ {showAiFooter && error.type === STATUS.ERROR && (<ImportWithAiButtonloading={aiImporting}disabled={!importSource.src}@@ -429,7 +491,7 @@ export default function Modal({title={getModalTitle(modal)}visible={modal !== MODAL.NONE && modal !== MODAL.CONFIG_CUSTOM_TYPES}onOk={getModalOnOk}- {...(showAiFooter ? { footer: aiFooter } : {})}+ {...(showAiFooter || onBack ? { footer } : {})}afterClose={() => {setExportData(() => ({data: "",@@ -443,6 +505,7 @@ export default function Modal({setImportData(null);setImportSource({src: "",+ schema: "",overwrite: false,});}}diff --git a/src/components/EditorHeader/Modal/New.jsx b/src/components/EditorHeader/Modal/New.jsxindex 572ba10f..b8e71f75 100644--- a/src/components/EditorHeader/Modal/New.jsx+++ b/src/components/EditorHeader/Modal/New.jsx@@ -1,28 +1,17 @@-import { db } from "../../../data/db";import { useSettings } from "../../../hooks";-import { useLiveQuery } from "dexie-react-hooks";import Thumbnail from "../../Thumbnail";-import { useTranslation } from "react-i18next";import { Slot } from "../../../context/ExtensionsContext";-export default function New({ selectedTemplateId, setSelectedTemplateId }) {+export default function New({+ templates,+ selectedTemplateId,+ setSelectedTemplateId,+}) {const { settings } = useSettings();- const { t } = useTranslation();- const templates = useLiveQuery(() => db.templates.toArray());return (<div className="grid grid-cols-3 gap-2 overflow-auto px-1">- <div onClick={() => setSelectedTemplateId("blank")}>- <div- className={`rounded-md h-[180px] border-2 hover:border-dashed ${- selectedTemplateId === "blank" ? "border-blue-400" : "border-zinc-400"- }`}- >- <Thumbnail i="blank" diagram={{}} zoom={0.24} theme={settings.mode} />- </div>- <div className="text-center mt-1">{t("blank")}</div>- </div>- {templates?.map((temp) => (+ {templates.map((temp) => (<divkey={temp.templateId}onClick={() => setSelectedTemplateId(temp.templateId)}diff --git a/src/components/StartModal.jsx b/src/components/StartModal.jsxnew file mode 100644index 00000000..457d8474--- /dev/null+++ b/src/components/StartModal.jsx@@ -0,0 +1,236 @@+import { useState } from "react";+import { useLiveQuery } from "dexie-react-hooks";+import { Button, Modal, Tag } from "@douyinfe/semi-ui";+import { useTranslation } from "react-i18next";+import { DB, IMPORT_FROM, MODAL } from "../data/constants";+import { databases } from "../data/databases";+import { db } from "../data/db";+import { Slot } from "../context/ExtensionsContext";+import { useSettings } from "../hooks";+import New from "./EditorHeader/Modal/New";++const STEP = {+ DATABASE: 0,+ START: 1,+ TEMPLATE: 2,+};++export default function StartModal({ visible, onStart, onTemplate }) {+ const { t } = useTranslation();+ const { settings } = useSettings();+ const [step, setStep] = useState(STEP.DATABASE);+ const [selectedStart, setSelectedStart] = useState(0);+ const [selectedDb, setSelectedDb] = useState("");+ const [selectedTemplateId, setSelectedTemplateId] = useState(-1);+ const templates = useLiveQuery(+ () =>+ db.templates+ .filter((template) => (template.database || DB.GENERIC) === selectedDb)+ .toArray(),+ [selectedDb],+ );++ const startOptions = [+ {+ icon: "bi-plus-square-dotted",+ title: t("start_blank"),+ description: t("start_blank_description"),+ },+ {+ icon: "bi-database-down",+ title: t("import_from_database"),+ description: t("start_database_description"),+ modal: MODAL.IMPORT_DB,+ unsupported: selectedDb === DB.GENERIC && t("not_supported"),+ },+ {+ icon: "bi-filetype-sql",+ title: t("import_from_source"),+ description: t("start_sql_description"),+ modal: MODAL.IMPORT_SRC,+ unsupported: selectedDb === DB.GENERIC && t("not_supported"),+ },+ {+ icon: "bi-code-square",+ title: "DBML",+ description: t("start_dbml_description"),+ modal: MODAL.IMPORT,+ importFrom: IMPORT_FROM.DBML,+ },+ {+ icon: "bi-filetype-json",+ title: "JSON",+ description: t("start_json_description"),+ modal: MODAL.IMPORT,+ importFrom: IMPORT_FROM.JSON,+ },+ ...(templates?.length+ ? [+ {+ icon: "bi-collection",+ title: t("start_template"),+ description: t("start_template_description"),+ template: true,+ },+ ]+ : []),+ ];++ const start = (option) => {+ if (option.template) {+ setSelectedTemplateId(-1);+ setStep(STEP.TEMPLATE);+ return;+ }+ onStart(selectedDb, option);+ };++ const cardClass = (selected) =>+ `p-3 rounded-md border-2 select-none outline-none ${+ settings.mode === "dark"+ ? "bg-zinc-700 enabled:hover:bg-zinc-600"+ : "bg-zinc-100 enabled:hover:bg-zinc-200"+ } ${selected ? "border-blue-400" : "border-transparent"}`;++ return (+ <Modal+ centered+ width={740}+ closable={false}+ title={+ step === STEP.START+ ? t("create_new_diagram")+ : step === STEP.TEMPLATE+ ? t("templates")+ : t("pick_db")+ }+ visible={visible}+ bodyStyle={{ maxHeight: window.innerHeight - 280, overflow: "auto" }}+ footer={+ step === STEP.DATABASE ? (+ <Button+ theme="solid"+ disabled={selectedDb === ""}+ onClick={() => {+ setSelectedStart(0);+ setStep(STEP.START);+ }}+ >+ {t("continue")}+ </Button>+ ) : (+ <>+ <Button+ type="tertiary"+ onClick={() =>+ setStep(step === STEP.TEMPLATE ? STEP.START : STEP.DATABASE)+ }+ >+ {t("back")}+ </Button>+ {step === STEP.TEMPLATE ? (+ <Button+ theme="solid"+ disabled={selectedTemplateId === -1}+ onClick={() => onTemplate(selectedTemplateId)}+ >+ {t("create")}+ </Button>+ ) : (+ <Button+ theme="solid"+ onClick={() => start(startOptions[selectedStart])}+ >+ {startOptions[selectedStart]?.template+ ? t("next")+ : t("create")}+ </Button>+ )}+ </>+ )+ }+ >+ {step === STEP.START && (+ <div className="grid grid-cols-3 gap-4 place-content-center">+ {startOptions.map((o, i) => (+ <button+ key={o.title}+ disabled={!!o.unsupported}+ tabIndex={selectedStart === i ? 0 : -1}+ onClick={() => setSelectedStart(i)}+ onFocus={() => setSelectedStart(i)}+ onDoubleClick={() => start(o)}+ onKeyDown={(e) => {+ const move = {+ ArrowRight: 1,+ ArrowLeft: -1,+ ArrowDown: 3,+ ArrowUp: -3,+ }[e.key];+ if (!move) return;+ e.preventDefault();+ let next = i + move;+ while (startOptions[next]?.unsupported) next += Math.sign(move);+ if (startOptions[next])+ e.currentTarget.parentElement.children[next].focus();+ }}+ className={`flex flex-col items-start gap-2 text-start disabled:opacity-50 disabled:cursor-not-allowed ${cardClass(selectedStart === i)}`}+ >+ <div className="h-8 w-full flex items-center justify-between">+ <i+ className={`bi ${o.icon} text-2xl leading-none opacity-60`}+ />+ {o.unsupported && <Tag size="small">{o.unsupported}</Tag>}+ </div>+ <div className="font-semibold">{o.title}</div>+ <div className="text-xs">{o.description}</div>+ </button>+ ))}+ <Slot name="start-options-end" />+ </div>+ )}+ {step === STEP.DATABASE && (+ <div className="grid grid-cols-3 gap-4 place-content-center">+ {Object.values(databases).map((x) => (+ <button+ key={x.name}+ onClick={() => setSelectedDb(x.label)}+ onDoubleClick={() => {+ setSelectedStart(0);+ setStep(STEP.START);+ }}+ className={`text-start space-y-3 ${cardClass(selectedDb === x.label)}`}+ >+ <div className="flex items-center justify-between">+ <div className="font-semibold">{x.name}</div>+ {x.beta && (+ <Tag size="small" color="light-blue">+ Beta+ </Tag>+ )}+ </div>+ {x.image && (+ <img+ src={x.image}+ className="h-8"+ style={{+ filter:+ "opacity(0.4) drop-shadow(0 0 0 white) drop-shadow(0 0 0 white)",+ }}+ />+ )}+ <div className="text-xs">{x.description}</div>+ </button>+ ))}+ </div>+ )}+ {step === STEP.TEMPLATE && (+ <New+ templates={templates ?? []}+ selectedTemplateId={selectedTemplateId}+ setSelectedTemplateId={setSelectedTemplateId}+ />+ )}+ </Modal>+ );+}diff --git a/src/components/Workspace.jsx b/src/components/Workspace.jsxindex a076c1b3..bec4f93a 100644--- a/src/components/Workspace.jsx+++ b/src/components/Workspace.jsx@@ -30,7 +30,8 @@ import {useNavigateWithParams,} from "../hooks";import FloatingControls from "./FloatingControls";-import { Button, Modal, Tag } from "@douyinfe/semi-ui";+import StartModal from "./StartModal";+import { Button, Modal } from "@douyinfe/semi-ui";import { IconAlertTriangle } from "@douyinfe/semi-icons";import { useTranslation } from "react-i18next";import { databases } from "../data/databases";@@ -64,6 +65,7 @@ export default function WorkSpace({ forcedDiagramId } = {}) {const [showSelectDbModal, setShowSelectDbModal] = useState(false);const [showRestoreModal, setShowRestoreModal] = useState(false);const [selectedDb, setSelectedDb] = useState("");+ const [startWith, setStartWith] = useState(null);const [diagramSource, setDiagramSource] = useState(null);const [dismissedBanners, setDismissedBanners] =@@ -536,6 +538,9 @@ export default function WorkSpace({ forcedDiagramId } = {}) {lastSaved={lastSaved}setLastSaved={setLastSaved}toolbarContainer={toolbarContainer}+ startWith={startWith}+ setStartWith={setStartWith}+ onBackToStart={() => setShowSelectDbModal(true)}/></IdContext.Provider><div@@ -617,55 +622,19 @@ export default function WorkSpace({ forcedDiagramId } = {}) {</div><Slot name="right-panel" /></div>- <Modal- centered- size="medium"- closable={false}- hasCancel={false}- title={t("pick_db")}- okText={t("confirm")}+ <StartModalvisible={showSelectDbModal}- onOk={() => {- if (selectedDb === "") return;- setDatabase(selectedDb);+ onStart={(database, option) => {+ setSelectedDb(database);+ setDatabase(database);setShowSelectDbModal(false);+ if (option.modal) setStartWith(option);}}- okButtonProps={{ disabled: selectedDb === "" }}- >- <div className="grid grid-cols-3 gap-4 place-content-center">- {Object.values(databases).map((x) => (- <div- key={x.name}- onClick={() => setSelectedDb(x.label)}- className={`space-y-3 p-3 rounded-md border-2 select-none ${- settings.mode === "dark"- ? "bg-zinc-700 hover:bg-zinc-600"- : "bg-zinc-100 hover:bg-zinc-200"- } ${selectedDb === x.label ? "border-zinc-400" : "border-transparent"}`}- >- <div className="flex items-center justify-between">- <div className="font-semibold">{x.name}</div>- {x.beta && (- <Tag size="small" color="light-blue">- Beta- </Tag>- )}- </div>- {x.image && (- <img- src={x.image}- className="h-8"- style={{- filter:- "opacity(0.4) drop-shadow(0 0 0 white) drop-shadow(0 0 0 white)",- }}- />- )}- <div className="text-xs">{x.description}</div>- </div>- ))}- </div>- </Modal>+ onTemplate={(templateId) => {+ setShowSelectDbModal(false);+ navigate(`/editor/templates/${templateId}`, { replace: true });+ }}+ /><Modalvisible={showRestoreModal}centereddiff --git a/src/data/constants.js b/src/data/constants.jsindex 2d2d2d59..0ad002b1 100644--- a/src/data/constants.js+++ b/src/data/constants.js@@ -90,11 +90,11 @@ export const MODAL = {RENAME: 4,OPEN: 5,SAVEAS: 6,- NEW: 7,IMPORT_SRC: 8,LANGUAGE: 10,SHARE: 11,CONFIG_CUSTOM_TYPES: 12,+ IMPORT_DB: 13,};export const STATUS = {diff --git a/src/i18n/locales/en.js b/src/i18n/locales/en.jsindex 3dfb178c..caf6a75c 100644--- a/src/i18n/locales/en.js+++ b/src/i18n/locales/en.js@@ -224,6 +224,19 @@ const en = {delete_relationship: "Delete relationship {{refName}}",not_found: "Not found",pick_db: "Choose a database",+ back: "Back",+ next: "Next",+ not_supported: "Not supported",+ start_template: "From a template",+ start_template_description:+ "Pick a ready-made schema, like a blog or an online store.",+ start_blank: "Blank canvas",+ start_blank_description: "Design a new schema from scratch.",+ start_database_description:+ "Run a read-only query against your database and paste the result.",+ start_sql_description: "Paste or upload CREATE TABLE statements.",+ start_dbml_description: "Upload a .dbml file, e.g. from dbdiagram.io.",+ start_json_description: "Open a diagram exported from drawDB.",generic: "Generic",generic_description:"Generic diagrams can be exported to any SQL flavor but support few data types.",@@ -300,6 +313,32 @@ const en = {download: "Download",insert_sql: "Insert SQL",upload_file: "Upload file",+ import_from_database: "Import from database",+ schema_query_instructions:+ "Run this read-only query against your {{database}} database in any SQL client, then paste the single value it returns on the right. Your credentials never leave your machine.",+ requires_version: "Requires {{version}} or later.",+ schema_query_oracle_note: "Column defaults are not imported.",+ query: "Query",+ paste_result: "Paste result",+ schema_query_large:+ "Large schema? Some SQL clients cut off long values. Download the query, run it from the command line, and upload the file it writes:",+ upload_query_result: "Upload the query result (.json or .txt)",+ invalid_query_result:+ "This doesn't look like the query result. Copy the whole drawdb_schema value.",+ truncated_query_result:+ "The query result is cut off. Your SQL client likely truncated it, so run the query from the command line and upload the file instead.",+ import_db_summary: "Imported {{tables}} and {{relationships}}.",+ import_db_skipped: "Not imported: {{items}}.",+ import_db_tables_one: "{{count}} table",+ import_db_tables_other: "{{count}} tables",+ import_db_relationships_one: "{{count}} relationship",+ import_db_relationships_other: "{{count}} relationships",+ import_db_views_one: "{{count}} view",+ import_db_views_other: "{{count}} views",+ import_db_indexes_one: "{{count}} expression or partial index",+ import_db_indexes_other: "{{count}} expression or partial indexes",+ import_db_checks_one: "{{count}} CHECK constraint",+ import_db_checks_other: "{{count}} CHECK constraints",show_comments: "Show comments",sql_header: "SQL header",sql_header_description:diff --git a/src/utils/autoArrange.js b/src/utils/autoArrange.jsindex 9e0dbfa1..b199cff9 100644--- a/src/utils/autoArrange.js+++ b/src/utils/autoArrange.js@@ -5,6 +5,9 @@ import { getTableHeight, getTableWidth } from "./utils";const nodeSep = 60;const rankSep = 110;const isolatedGap = 60;+const targetRatio = 16 / 9;+const minRatio = 1 / 3;+const maxRatio = 4;export function autoArrange(tables, relationships, settings) {const movable = tables.filter((table) => !table.locked);@@ -49,20 +52,124 @@ export function autoArrange(tables, relationships, settings) {layout(graph);- const positions = [];- let maxX = 0;- let maxY = 0;- for (const table of connected) {+ const placed = connected.map((table) => {const node = graph.node(String(table.id));- const x = node.x - node.width / 2;- const y = node.y - node.height / 2;- positions.push({ id: table.id, x, y });- maxX = Math.max(maxX, x + node.width);- maxY = Math.max(maxY, y + node.height);+ return {+ id: table.id,+ x: node.x - node.width / 2,+ y: node.y - node.height / 2,+ width: node.width,+ height: node.height,+ rank: Math.round(node.x),+ };+ });++ const extent = () => ({+ width: Math.max(0, ...placed.map((p) => p.x + p.width)),+ height: Math.max(0, ...placed.map((p) => p.y + p.height)),+ });+ let { width: maxX, height: maxY } = extent();++ const ratio = maxX / maxY;+ if (placed.length > 1 && (ratio < minRatio || ratio > maxRatio)) {+ const ranks = new Map();+ for (const p of [...placed].sort((a, b) => a.y - b.y)) {+ if (!ranks.has(p.rank)) ranks.set(p.rank, []);+ ranks.get(p.rank).push(p);+ }++ const rankOrder = [...ranks.keys()].sort((a, b) => b - a);+ const buildColumns = (heightLimit) => {+ const columns = [];+ for (const rank of rankOrder) {+ const nodes = ranks.get(rank);+ const rankHeight = nodes.reduce(+ (sum, p) => sum + p.height + nodeSep,+ 0,+ );+ const columnHeight =+ rankHeight / Math.max(1, Math.ceil(rankHeight / heightLimit));+ let column = null;+ for (const p of nodes) {+ if (!column || column.height + p.height > columnHeight) {+ column = { nodes: [], width: 0, height: 0 };+ columns.push(column);+ }+ column.nodes.push({ p, offset: column.height });+ column.height += p.height + nodeSep;+ column.width = Math.max(column.width, p.width);+ }+ }+ return columns;+ };++ const placeColumns = (columns, bandWidth) => {+ const slots = [];+ let x = 0;+ let y = 0;+ let width = 0;+ let bandHeight = 0;+ for (const column of columns) {+ let gap = x === 0 ? 0 : rankSep;+ if (x > 0 && x + gap + column.width > bandWidth) {+ y += bandHeight + rankSep;+ x = 0;+ gap = 0;+ bandHeight = 0;+ }+ slots.push({ column, x: x + gap, y });+ x += gap + column.width;+ width = Math.max(width, x);+ bandHeight = Math.max(bandHeight, column.height - nodeSep);+ }+ const height = y + bandHeight;+ return {+ slots,+ score: Math.abs(Math.log(width / height / targetRatio)),+ };+ };++ const tallest = Math.max(...placed.map((p) => p.height + nodeSep));+ const longest = Math.max(+ ...[...ranks.values()].map((nodes) =>+ nodes.reduce((sum, p) => sum + p.height + nodeSep, 0),+ ),+ );+ let best = null;+ for (let step = 0; step <= 12; step++) {+ const columns = buildColumns(+ tallest * Math.pow(longest / tallest, step / 12),+ );+ const totalWidth =+ columns.reduce((sum, column) => sum + column.width + rankSep, 0) -+ rankSep;+ for (let bands = 1; bands <= columns.length; bands++) {+ const candidate = placeColumns(columns, totalWidth / bands + 1);+ if (!best || candidate.score < best.score) best = candidate;+ }+ }+ for (const { column, x, y } of best.slots) {+ for (const { p, offset } of column.nodes) {+ p.x = x;+ p.y = y + offset;+ }+ }++ ({ width: maxX, height: maxY } = extent());}+ const positions = placed.map(({ id, x, y }) => ({ id, x, y }));+if (isolated.length > 0) {- const rowWidth = Math.max(maxX, 4 * defaultTableWidth + 3 * isolatedGap);+ const isolatedArea = isolated.reduce((sum, table) => {+ const { width, height } = sizeOf(table);+ return sum + (width + isolatedGap) * (height + isolatedGap);+ }, 0);+ const rowWidth = Math.max(+ maxX,+ Math.sqrt(isolatedArea * targetRatio),+ 4 * defaultTableWidth + 3 * isolatedGap,+ );let x = 0;let y = connected.length > 0 ? maxY + rankSep : 0;let rowHeight = 0;diff --git a/src/utils/dbml/reconcile.js b/src/utils/dbml/reconcile.jsindex dc84589f..88a5037b 100644--- a/src/utils/dbml/reconcile.js+++ b/src/utils/dbml/reconcile.js@@ -96,6 +96,8 @@ function createField(parsed) {};if (parsed.size !== "") field.size = parsed.size;+ if (parsed.isArray) field.isArray = true;+ if (parsed.unsigned) field.unsigned = true;if (isInlineEnumType(parsed.type)) field.values = parsed.values ?? [];return field;diff --git a/src/utils/importFrom/schemaQuery/index.js b/src/utils/importFrom/schemaQuery/index.jsnew file mode 100644index 00000000..e2d7e290--- /dev/null+++ b/src/utils/importFrom/schemaQuery/index.js@@ -0,0 +1,98 @@+import { DB } from "../../../data/constants";+import { reconcileDbml } from "../../dbml/reconcile";+import { mariadb } from "./mariadb";+import { mssql } from "./mssql";+import { mysql } from "./mysql";+import { oraclesql } from "./oraclesql";+import { postgres } from "./postgres";+import { sqlite } from "./sqlite";++export const schemaQueries = {+ [DB.MYSQL]: mysql,+ [DB.POSTGRES]: postgres,+ [DB.SQLITE]: sqlite,+ [DB.MARIADB]: mariadb,+ [DB.MSSQL]: mssql,+ [DB.ORACLESQL]: oraclesql,+};++const structuralKeys = new Set([+ "tables",+ "fields",+ "indices",+ "relationships",+ "enums",+ "values",+ "startFieldNames",+ "endFieldNames",+ "skipped",+]);+const flagKeys = new Set([+ "primary",+ "unique",+ "notNull",+ "increment",+ "isArray",+ "unsigned",+]);+const textKeys = new Set(["comment", "default", "size"]);++function reviver(key, value) {+ if (flagKeys.has(key)) {+ return value === true || value === 1 || value === "1" || value === "true";+ }+ if (textKeys.has(key)) return value == null ? "" : String(value);+ if (+ structuralKeys.has(key) &&+ typeof value === "string" &&+ /^\s*[[{]/.test(value)+ ) {+ return JSON.parse(value, reviver);+ }+ return value;+}++export function fromSchemaQuery(raw, database) {+ const src = raw.replace(/[\r\n]/g, "");+ const start = src.indexOf("{");+ if (start === -1) throw new Error("invalid");++ let depth = 0;+ let inString = false;+ let end = -1;+ for (let i = start; i < src.length; i++) {+ const c = src[i];+ if (inString) {+ if (c === "\\") i++;+ else if (c === '"') inString = false;+ } else if (c === '"') inString = true;+ else if (c === "{") depth++;+ else if (c === "}" && --depth === 0) {+ end = i;+ break;+ }+ }++ let text = src.slice(start, end === -1 ? src.lastIndexOf("}") + 1 : end + 1);+ let parsed;+ try {+ parsed = JSON.parse(text, reviver);+ } catch {+ text = text.replace(/""/g, '"');+ try {+ parsed = JSON.parse(text, reviver);+ } catch {+ throw new Error(end === -1 ? "truncated" : "invalid");+ }+ }++ if (!Array.isArray(parsed?.tables) || !Array.isArray(parsed?.relationships)) {+ throw new Error("invalid");+ }++ return {+ ...reconcileDbml({ enums: [], ...parsed }, null, database),+ types: [],+ skipped: parsed.skipped ?? {},+ };+}diff --git a/src/utils/importFrom/schemaQuery/mariadb.js b/src/utils/importFrom/schemaQuery/mariadb.jsnew file mode 100644index 00000000..028927a7--- /dev/null+++ b/src/utils/importFrom/schemaQuery/mariadb.js@@ -0,0 +1,114 @@+const query = String.raw`SET STATEMENT group_concat_max_len = 1073741824 FOR WITH+jsoncol AS (+ SELECT TABLE_NAME, CONSTRAINT_NAME AS COLUMN_NAME+ FROM information_schema.CHECK_CONSTRAINTS+ WHERE CONSTRAINT_SCHEMA = DATABASE()+ AND CHECK_CLAUSE = CONCAT('json_valid(', CHAR(96), CONSTRAINT_NAME, CHAR(96), ')')+),+idx AS (+ SELECT s.TABLE_NAME, s.INDEX_NAME,+ MIN(s.NON_UNIQUE) = 0 AS is_unique,+ COUNT(*) AS n,+ SUM(s.COLUMN_NAME IS NULL) AS exprs,+ MIN(s.COLUMN_NAME) AS first_col,+ CONCAT('[', GROUP_CONCAT(JSON_QUOTE(s.COLUMN_NAME) ORDER BY s.SEQ_IN_INDEX), ']') AS cols,+ GROUP_CONCAT(s.COLUMN_NAME ORDER BY s.COLUMN_NAME) AS col_set+ FROM information_schema.STATISTICS s+ WHERE s.TABLE_SCHEMA = DATABASE()+ GROUP BY s.TABLE_NAME, s.INDEX_NAME+),+fld AS (+ SELECT c.TABLE_NAME, GROUP_CONCAT(JSON_OBJECT(+ 'name', c.COLUMN_NAME,+ 'type', CASE+ WHEN EXISTS (SELECT 1 FROM jsoncol j WHERE j.TABLE_NAME = c.TABLE_NAME+ AND j.COLUMN_NAME = c.COLUMN_NAME) THEN 'JSON'+ WHEN c.COLUMN_TYPE LIKE 'tinyint(1)%' THEN 'BOOLEAN'+ WHEN c.DATA_TYPE = 'int' THEN 'INTEGER'+ ELSE UPPER(c.DATA_TYPE) END,+ 'size', CASE+ WHEN c.DATA_TYPE IN ('char', 'varchar', 'binary', 'varbinary') THEN c.CHARACTER_MAXIMUM_LENGTH+ WHEN c.DATA_TYPE IN ('decimal', 'numeric') THEN CONCAT(c.NUMERIC_PRECISION, ',', c.NUMERIC_SCALE)+ WHEN c.DATA_TYPE = 'bit' THEN c.NUMERIC_PRECISION+ ELSE '' END,+ 'values', CASE WHEN c.DATA_TYPE IN ('enum', 'set') THEN JSON_EXTRACT(CONCAT('[', REPLACE(JSON_QUOTE(REPLACE(REPLACE(+ SUBSTRING(c.COLUMN_TYPE, LOCATE('(', c.COLUMN_TYPE) + 2, CHAR_LENGTH(c.COLUMN_TYPE) - LOCATE('(', c.COLUMN_TYPE) - 3),+ ''',''', CHAR(1)), '''''', '''')), CONCAT(CHAR(92), 'u0001'), '","'), ']'), '$') END,+ 'default', CASE+ WHEN c.COLUMN_DEFAULT IS NULL OR c.COLUMN_DEFAULT = 'NULL' THEN NULL+ WHEN c.COLUMN_DEFAULT LIKE '''%''' THEN+ REPLACE(SUBSTRING(c.COLUMN_DEFAULT, 2, CHAR_LENGTH(c.COLUMN_DEFAULT) - 2), '''''', '''')+ ELSE c.COLUMN_DEFAULT END,+ 'primary', c.COLUMN_KEY = 'PRI',+ 'unique', EXISTS (SELECT 1 FROM idx WHERE idx.TABLE_NAME = c.TABLE_NAME+ AND idx.INDEX_NAME <> 'PRIMARY' AND idx.is_unique AND idx.n = 1 AND idx.first_col = c.COLUMN_NAME),+ 'notNull', c.IS_NULLABLE = 'NO',+ 'increment', c.EXTRA LIKE '%auto_increment%',+ 'unsigned', c.COLUMN_TYPE LIKE '%unsigned%',+ 'comment', c.COLUMN_COMMENT+ ) ORDER BY c.ORDINAL_POSITION) AS j+ FROM information_schema.COLUMNS c+ WHERE c.TABLE_SCHEMA = DATABASE()+ GROUP BY c.TABLE_NAME+),+ix AS (+ SELECT TABLE_NAME, GROUP_CONCAT(JSON_OBJECT(+ 'name', INDEX_NAME, 'unique', is_unique, 'fields', JSON_EXTRACT(cols, '$')+ ) ORDER BY INDEX_NAME) AS j+ FROM idx+ WHERE INDEX_NAME <> 'PRIMARY' AND exprs = 0 AND NOT (is_unique AND n = 1)+ GROUP BY TABLE_NAME+),+fk AS (+ SELECT k.CONSTRAINT_NAME, k.TABLE_NAME, k.REFERENCED_TABLE_NAME,+ CONCAT('[', GROUP_CONCAT(JSON_QUOTE(k.COLUMN_NAME) ORDER BY k.ORDINAL_POSITION), ']') AS start_cols,+ CONCAT('[', GROUP_CONCAT(JSON_QUOTE(k.REFERENCED_COLUMN_NAME) ORDER BY k.ORDINAL_POSITION), ']') AS end_cols,+ GROUP_CONCAT(k.COLUMN_NAME ORDER BY k.COLUMN_NAME) AS col_set+ FROM information_schema.KEY_COLUMN_USAGE k+ WHERE k.TABLE_SCHEMA = DATABASE() AND k.REFERENCED_TABLE_SCHEMA = DATABASE()+ GROUP BY k.CONSTRAINT_NAME, k.TABLE_NAME, k.REFERENCED_TABLE_NAME+)+SELECT JSON_OBJECT(+ 'tables', JSON_EXTRACT((SELECT CONCAT('[', COALESCE(GROUP_CONCAT(JSON_OBJECT(+ 'name', t.TABLE_NAME,+ 'comment', t.TABLE_COMMENT,+ 'fields', JSON_EXTRACT(CONCAT('[', fld.j, ']'), '$'),+ 'indices', JSON_EXTRACT(CONCAT('[', COALESCE(ix.j, ''), ']'), '$')+ ) ORDER BY t.TABLE_NAME), ''), ']')+ FROM information_schema.TABLES t+ JOIN fld ON fld.TABLE_NAME = t.TABLE_NAME+ LEFT JOIN ix ON ix.TABLE_NAME = t.TABLE_NAME+ WHERE t.TABLE_SCHEMA = DATABASE() AND t.TABLE_TYPE = 'BASE TABLE'), '$'),+ 'relationships', JSON_EXTRACT((SELECT CONCAT('[', COALESCE(GROUP_CONCAT(JSON_OBJECT(+ 'name', fk.CONSTRAINT_NAME,+ 'startTableName', fk.TABLE_NAME,+ 'startFieldNames', JSON_EXTRACT(fk.start_cols, '$'),+ 'endTableName', fk.REFERENCED_TABLE_NAME,+ 'endFieldNames', JSON_EXTRACT(fk.end_cols, '$'),+ 'cardinality', IF(EXISTS (SELECT 1 FROM idx WHERE idx.TABLE_NAME = fk.TABLE_NAME+ AND idx.is_unique AND idx.col_set = fk.col_set), 'one_to_one', 'many_to_one'),+ 'deleteConstraint', CASE rc.DELETE_RULE WHEN 'CASCADE' THEN 'Cascade' WHEN 'SET NULL' THEN 'Set null'+ WHEN 'SET DEFAULT' THEN 'Set default' WHEN 'RESTRICT' THEN 'Restrict' ELSE 'No action' END,+ 'updateConstraint', CASE rc.UPDATE_RULE WHEN 'CASCADE' THEN 'Cascade' WHEN 'SET NULL' THEN 'Set null'+ WHEN 'SET DEFAULT' THEN 'Set default' WHEN 'RESTRICT' THEN 'Restrict' ELSE 'No action' END+ ) ORDER BY fk.CONSTRAINT_NAME), ''), ']')+ FROM fk+ JOIN information_schema.REFERENTIAL_CONSTRAINTS rc+ ON rc.CONSTRAINT_SCHEMA = DATABASE() AND rc.CONSTRAINT_NAME = fk.CONSTRAINT_NAME+ AND rc.TABLE_NAME = fk.TABLE_NAME), '$'),+ 'enums', JSON_ARRAY(),+ 'skipped', JSON_OBJECT(+ 'views', (SELECT COUNT(*) FROM information_schema.TABLES+ WHERE TABLE_SCHEMA = DATABASE() AND TABLE_TYPE = 'VIEW'),+ 'indexes', (SELECT COUNT(*) FROM idx WHERE exprs > 0),+ 'checks', (SELECT COUNT(*) FROM information_schema.CHECK_CONSTRAINTS cc+ WHERE cc.CONSTRAINT_SCHEMA = DATABASE() AND NOT EXISTS (SELECT 1 FROM jsoncol j+ WHERE j.TABLE_NAME = cc.TABLE_NAME AND j.COLUMN_NAME = cc.CONSTRAINT_NAME))+ )+) AS drawdb_schema;`;++export const mariadb = {+ query,+ minVersion: "MariaDB 10.5",+ cli: "mariadb -N -r -D <database> < drawdb-schema.sql > drawdb-schema.json",+};diff --git a/src/utils/importFrom/schemaQuery/mssql.js b/src/utils/importFrom/schemaQuery/mssql.jsnew file mode 100644index 00000000..0484ed65--- /dev/null+++ b/src/utils/importFrom/schemaQuery/mssql.js@@ -0,0 +1,140 @@+const query = String.raw`SELECT (+ SELECT+ JSON_QUERY(ISNULL((+ SELECT+ CASE WHEN s.name = 'dbo' THEN t.name ELSE s.name + '.' + t.name END AS name,+ ISNULL(CAST(ep.value AS nvarchar(max)), '') AS comment,+ JSON_QUERY(ISNULL((+ SELECT+ c.name AS name,+ CASE ty.base WHEN 'int' THEN 'INTEGER' ELSE UPPER(ty.base) END AS type,+ CASE+ WHEN ty.base IN ('varchar', 'char', 'varbinary', 'binary')+ THEN CASE WHEN c.max_length = -1 THEN 'MAX' ELSE CAST(c.max_length AS varchar(10)) END+ WHEN ty.base IN ('nvarchar', 'nchar')+ THEN CASE WHEN c.max_length = -1 THEN 'MAX' ELSE CAST(c.max_length / 2 AS varchar(10)) END+ WHEN ty.base IN ('decimal', 'numeric')+ THEN CAST(c.precision AS varchar(5)) + ',' + CAST(c.scale AS varchar(5))+ ELSE '' END AS size,+ ISNULL(CASE+ WHEN d.v LIKE 'N''%''' THEN REPLACE(SUBSTRING(d.v, 3, LEN(d.v) - 3), '''''', '''')+ WHEN d.v LIKE '''%''' THEN REPLACE(SUBSTRING(d.v, 2, LEN(d.v) - 2), '''''', '''')+ ELSE d.v END, '') AS [default],+ CAST(CASE WHEN EXISTS (+ SELECT 1 FROM sys.indexes i JOIN sys.index_columns ic+ ON ic.object_id = i.object_id AND ic.index_id = i.index_id+ WHERE i.object_id = c.object_id AND i.is_primary_key = 1 AND ic.column_id = c.column_id+ ) THEN 1 ELSE 0 END AS bit) AS [primary],+ CAST(CASE WHEN EXISTS (+ SELECT 1 FROM sys.indexes i JOIN sys.index_columns ic+ ON ic.object_id = i.object_id AND ic.index_id = i.index_id AND ic.is_included_column = 0+ WHERE i.object_id = c.object_id AND i.is_unique = 1 AND i.is_primary_key = 0+ AND i.has_filter = 0 AND ic.column_id = c.column_id+ AND (SELECT COUNT(*) FROM sys.index_columns k WHERE k.object_id = i.object_id+ AND k.index_id = i.index_id AND k.is_included_column = 0) = 1+ ) THEN 1 ELSE 0 END AS bit) AS [unique],+ CAST(CASE WHEN c.is_nullable = 0 THEN 1 ELSE 0 END AS bit) AS notNull,+ c.is_identity AS increment,+ ISNULL(CAST(cep.value AS nvarchar(max)), '') AS comment+ FROM sys.columns c+ JOIN sys.types ut ON ut.user_type_id = c.user_type_id+ CROSS APPLY (SELECT CASE WHEN ut.is_user_defined = 1 AND ut.is_assembly_type = 0+ THEN TYPE_NAME(ut.system_type_id) ELSE ut.name END AS base) ty+ LEFT JOIN sys.default_constraints dc ON dc.object_id = c.default_object_id+ CROSS APPLY (SELECT CASE WHEN dc.definition LIKE '(%)'+ THEN SUBSTRING(dc.definition, 2, LEN(dc.definition) - 2) ELSE dc.definition END AS v1) d1+ CROSS APPLY (SELECT CASE WHEN d1.v1 LIKE '(%)'+ THEN SUBSTRING(d1.v1, 2, LEN(d1.v1) - 2) ELSE d1.v1 END AS v) d+ LEFT JOIN sys.extended_properties cep ON cep.class = 1 AND cep.major_id = c.object_id+ AND cep.minor_id = c.column_id AND cep.name = 'MS_Description'+ WHERE c.object_id = t.object_id+ ORDER BY c.column_id+ FOR JSON PATH+ ), '[]')) AS fields,+ JSON_QUERY(ISNULL((+ SELECT i.name AS name, i.is_unique AS [unique], JSON_QUERY(k.cols) AS fields+ FROM sys.indexes i+ CROSS APPLY (+ SELECT COUNT(*) AS n,+ '[' + STRING_AGG(CAST('"' + STRING_ESCAPE(col.name, 'json') + '"' AS nvarchar(max)), ',')+ WITHIN GROUP (ORDER BY ic.key_ordinal) + ']' AS cols+ FROM sys.index_columns ic+ JOIN sys.columns col ON col.object_id = ic.object_id AND col.column_id = ic.column_id+ WHERE ic.object_id = i.object_id AND ic.index_id = i.index_id AND ic.is_included_column = 0+ ) k+ WHERE i.object_id = t.object_id AND i.type IN (1, 2) AND i.is_primary_key = 0+ AND i.has_filter = 0 AND i.is_hypothetical = 0 AND NOT (i.is_unique = 1 AND k.n = 1)+ ORDER BY i.name+ FOR JSON PATH+ ), '[]')) AS indices+ FROM sys.tables t+ JOIN sys.schemas s ON s.schema_id = t.schema_id+ LEFT JOIN sys.extended_properties ep ON ep.class = 1 AND ep.major_id = t.object_id+ AND ep.minor_id = 0 AND ep.name = 'MS_Description'+ WHERE t.is_ms_shipped = 0+ ORDER BY name+ FOR JSON PATH+ ), '[]')) AS tables,+ JSON_QUERY(ISNULL((+ SELECT+ fk.name AS name,+ CASE WHEN ps.name = 'dbo' THEN pt.name ELSE ps.name + '.' + pt.name END AS startTableName,+ JSON_QUERY(cols.start_cols) AS startFieldNames,+ CASE WHEN rs.name = 'dbo' THEN rt.name ELSE rs.name + '.' + rt.name END AS endTableName,+ JSON_QUERY(cols.end_cols) AS endFieldNames,+ CASE WHEN EXISTS (+ SELECT 1 FROM sys.indexes i+ CROSS APPLY (SELECT STRING_AGG(CAST(ic.column_id AS varchar(10)), ',')+ WITHIN GROUP (ORDER BY ic.column_id) AS col_set+ FROM sys.index_columns ic+ WHERE ic.object_id = i.object_id AND ic.index_id = i.index_id AND ic.is_included_column = 0) ik+ WHERE i.object_id = fk.parent_object_id AND i.is_unique = 1 AND i.has_filter = 0+ AND ik.col_set = fkset.col_set+ ) THEN 'one_to_one' ELSE 'many_to_one' END AS cardinality,+ CASE fk.delete_referential_action WHEN 1 THEN 'Cascade' WHEN 2 THEN 'Set null'+ WHEN 3 THEN 'Set default' ELSE 'No action' END AS deleteConstraint,+ CASE fk.update_referential_action WHEN 1 THEN 'Cascade' WHEN 2 THEN 'Set null'+ WHEN 3 THEN 'Set default' ELSE 'No action' END AS updateConstraint+ FROM sys.foreign_keys fk+ JOIN sys.tables pt ON pt.object_id = fk.parent_object_id+ JOIN sys.schemas ps ON ps.schema_id = pt.schema_id+ JOIN sys.tables rt ON rt.object_id = fk.referenced_object_id+ JOIN sys.schemas rs ON rs.schema_id = rt.schema_id+ CROSS APPLY (+ SELECT+ '[' + STRING_AGG(CAST('"' + STRING_ESCAPE(pc.name, 'json') + '"' AS nvarchar(max)), ',')+ WITHIN GROUP (ORDER BY fkc.constraint_column_id) + ']' AS start_cols,+ '[' + STRING_AGG(CAST('"' + STRING_ESCAPE(rc.name, 'json') + '"' AS nvarchar(max)), ',')+ WITHIN GROUP (ORDER BY fkc.constraint_column_id) + ']' AS end_cols+ FROM sys.foreign_key_columns fkc+ JOIN sys.columns pc ON pc.object_id = fkc.parent_object_id AND pc.column_id = fkc.parent_column_id+ JOIN sys.columns rc ON rc.object_id = fkc.referenced_object_id AND rc.column_id = fkc.referenced_column_id+ WHERE fkc.constraint_object_id = fk.object_id+ ) cols+ CROSS APPLY (+ SELECT STRING_AGG(CAST(fkc.parent_column_id AS varchar(10)), ',')+ WITHIN GROUP (ORDER BY fkc.parent_column_id) AS col_set+ FROM sys.foreign_key_columns fkc+ WHERE fkc.constraint_object_id = fk.object_id+ ) fkset+ WHERE pt.is_ms_shipped = 0+ ORDER BY fk.name+ FOR JSON PATH+ ), '[]')) AS relationships,+ JSON_QUERY('[]') AS enums,+ JSON_QUERY((+ SELECT+ (SELECT COUNT(*) FROM sys.views WHERE is_ms_shipped = 0) AS views,+ (SELECT COUNT(*) FROM sys.indexes i JOIN sys.tables t ON t.object_id = i.object_id+ WHERE t.is_ms_shipped = 0 AND i.has_filter = 1) AS indexes,+ (SELECT COUNT(*) FROM sys.check_constraints WHERE is_ms_shipped = 0) AS checks+ FOR JSON PATH, WITHOUT_ARRAY_WRAPPER+ )) AS skipped+ FOR JSON PATH, WITHOUT_ARRAY_WRAPPER+) AS drawdb_schema;`;++export const mssql = {+ query,+ minVersion: "SQL Server 2017",+ cli: "sqlcmd -S <server> -d <database> -y 0 -i drawdb-schema.sql -o drawdb-schema.json",+};diff --git a/src/utils/importFrom/schemaQuery/mysql.js b/src/utils/importFrom/schemaQuery/mysql.jsnew file mode 100644index 00000000..a0f97027--- /dev/null+++ b/src/utils/importFrom/schemaQuery/mysql.js@@ -0,0 +1,101 @@+const query = String.raw`WITH+idx AS (+ SELECT s.TABLE_NAME, s.INDEX_NAME,+ MIN(s.NON_UNIQUE) = 0 AS is_unique,+ COUNT(*) AS n,+ SUM(s.COLUMN_NAME IS NULL) AS exprs,+ MIN(s.COLUMN_NAME) AS first_col,+ CONCAT('[', GROUP_CONCAT(JSON_QUOTE(s.COLUMN_NAME) ORDER BY s.SEQ_IN_INDEX), ']') AS cols,+ GROUP_CONCAT(s.COLUMN_NAME ORDER BY s.COLUMN_NAME) AS col_set+ FROM information_schema.STATISTICS s+ WHERE s.TABLE_SCHEMA = DATABASE()+ GROUP BY s.TABLE_NAME, s.INDEX_NAME+),+fld AS (+ SELECT c.TABLE_NAME, GROUP_CONCAT(JSON_OBJECT(+ 'name', c.COLUMN_NAME,+ 'type', CASE+ WHEN c.COLUMN_TYPE LIKE 'tinyint(1)%' THEN 'BOOLEAN'+ WHEN c.DATA_TYPE = 'int' THEN 'INTEGER'+ ELSE UPPER(c.DATA_TYPE) END,+ 'size', CASE+ WHEN c.DATA_TYPE IN ('char', 'varchar', 'binary', 'varbinary') THEN c.CHARACTER_MAXIMUM_LENGTH+ WHEN c.DATA_TYPE IN ('decimal', 'numeric') THEN CONCAT(c.NUMERIC_PRECISION, ',', c.NUMERIC_SCALE)+ WHEN c.DATA_TYPE = 'bit' THEN c.NUMERIC_PRECISION+ ELSE '' END,+ 'values', CASE WHEN c.DATA_TYPE IN ('enum', 'set') THEN CAST(CONCAT('[', REPLACE(JSON_QUOTE(REPLACE(REPLACE(+ SUBSTRING(c.COLUMN_TYPE, LOCATE('(', c.COLUMN_TYPE) + 2, CHAR_LENGTH(c.COLUMN_TYPE) - LOCATE('(', c.COLUMN_TYPE) - 3),+ ''',''', CHAR(1)), '''''', '''')), CONCAT(CHAR(92), 'u0001'), '","'), ']') AS JSON) END,+ 'default', c.COLUMN_DEFAULT,+ 'primary', c.COLUMN_KEY = 'PRI',+ 'unique', EXISTS (SELECT 1 FROM idx WHERE idx.TABLE_NAME = c.TABLE_NAME+ AND idx.INDEX_NAME <> 'PRIMARY' AND idx.is_unique AND idx.n = 1 AND idx.first_col = c.COLUMN_NAME),+ 'notNull', c.IS_NULLABLE = 'NO',+ 'increment', c.EXTRA LIKE '%auto_increment%',+ 'unsigned', c.COLUMN_TYPE LIKE '%unsigned%',+ 'comment', c.COLUMN_COMMENT+ ) ORDER BY c.ORDINAL_POSITION) AS j+ FROM information_schema.COLUMNS c+ WHERE c.TABLE_SCHEMA = DATABASE()+ GROUP BY c.TABLE_NAME+),+ix AS (+ SELECT TABLE_NAME, GROUP_CONCAT(JSON_OBJECT(+ 'name', INDEX_NAME, 'unique', is_unique, 'fields', CAST(cols AS JSON)+ ) ORDER BY INDEX_NAME) AS j+ FROM idx+ WHERE INDEX_NAME <> 'PRIMARY' AND exprs = 0 AND NOT (is_unique AND n = 1)+ GROUP BY TABLE_NAME+),+fk AS (+ SELECT k.CONSTRAINT_NAME, k.TABLE_NAME, k.REFERENCED_TABLE_NAME,+ CONCAT('[', GROUP_CONCAT(JSON_QUOTE(k.COLUMN_NAME) ORDER BY k.ORDINAL_POSITION), ']') AS start_cols,+ CONCAT('[', GROUP_CONCAT(JSON_QUOTE(k.REFERENCED_COLUMN_NAME) ORDER BY k.ORDINAL_POSITION), ']') AS end_cols,+ GROUP_CONCAT(k.COLUMN_NAME ORDER BY k.COLUMN_NAME) AS col_set+ FROM information_schema.KEY_COLUMN_USAGE k+ WHERE k.TABLE_SCHEMA = DATABASE() AND k.REFERENCED_TABLE_SCHEMA = DATABASE()+ GROUP BY k.CONSTRAINT_NAME, k.TABLE_NAME, k.REFERENCED_TABLE_NAME+)+SELECT /*+ SET_VAR(group_concat_max_len = 1073741824) */ JSON_OBJECT(+ 'tables', CAST((SELECT CONCAT('[', COALESCE(GROUP_CONCAT(JSON_OBJECT(+ 'name', t.TABLE_NAME,+ 'comment', t.TABLE_COMMENT,+ 'fields', CAST(CONCAT('[', fld.j, ']') AS JSON),+ 'indices', CAST(CONCAT('[', COALESCE(ix.j, ''), ']') AS JSON)+ ) ORDER BY t.TABLE_NAME), ''), ']')+ FROM information_schema.TABLES t+ JOIN fld ON fld.TABLE_NAME = t.TABLE_NAME+ LEFT JOIN ix ON ix.TABLE_NAME = t.TABLE_NAME+ WHERE t.TABLE_SCHEMA = DATABASE() AND t.TABLE_TYPE = 'BASE TABLE') AS JSON),+ 'relationships', CAST((SELECT CONCAT('[', COALESCE(GROUP_CONCAT(JSON_OBJECT(+ 'name', fk.CONSTRAINT_NAME,+ 'startTableName', fk.TABLE_NAME,+ 'startFieldNames', CAST(fk.start_cols AS JSON),+ 'endTableName', fk.REFERENCED_TABLE_NAME,+ 'endFieldNames', CAST(fk.end_cols AS JSON),+ 'cardinality', IF(EXISTS (SELECT 1 FROM idx WHERE idx.TABLE_NAME = fk.TABLE_NAME+ AND idx.is_unique AND idx.col_set = fk.col_set), 'one_to_one', 'many_to_one'),+ 'deleteConstraint', CASE rc.DELETE_RULE WHEN 'CASCADE' THEN 'Cascade' WHEN 'SET NULL' THEN 'Set null'+ WHEN 'SET DEFAULT' THEN 'Set default' WHEN 'RESTRICT' THEN 'Restrict' ELSE 'No action' END,+ 'updateConstraint', CASE rc.UPDATE_RULE WHEN 'CASCADE' THEN 'Cascade' WHEN 'SET NULL' THEN 'Set null'+ WHEN 'SET DEFAULT' THEN 'Set default' WHEN 'RESTRICT' THEN 'Restrict' ELSE 'No action' END+ ) ORDER BY fk.CONSTRAINT_NAME), ''), ']')+ FROM fk+ JOIN information_schema.REFERENTIAL_CONSTRAINTS rc+ ON rc.CONSTRAINT_SCHEMA = DATABASE() AND rc.CONSTRAINT_NAME = fk.CONSTRAINT_NAME+ AND rc.TABLE_NAME = fk.TABLE_NAME) AS JSON),+ 'enums', JSON_ARRAY(),+ 'skipped', JSON_OBJECT(+ 'views', (SELECT COUNT(*) FROM information_schema.TABLES+ WHERE TABLE_SCHEMA = DATABASE() AND TABLE_TYPE = 'VIEW'),+ 'indexes', (SELECT COUNT(*) FROM idx WHERE exprs > 0),+ 'checks', (SELECT COUNT(*) FROM information_schema.CHECK_CONSTRAINTS+ WHERE CONSTRAINT_SCHEMA = DATABASE())+ )+) AS drawdb_schema;`;++export const mysql = {+ query,+ minVersion: "MySQL 8.0.16",+ cli: "mysql -N -r -D <database> < drawdb-schema.sql > drawdb-schema.json",+};diff --git a/src/utils/importFrom/schemaQuery/oraclesql.js b/src/utils/importFrom/schemaQuery/oraclesql.jsnew file mode 100644index 00000000..6b3378a2--- /dev/null+++ b/src/utils/importFrom/schemaQuery/oraclesql.js@@ -0,0 +1,106 @@+const query = String.raw`SELECT JSON_OBJECT(+ 'tables' VALUE NVL((+ SELECT JSON_ARRAYAGG(JSON_OBJECT(+ 'name' VALUE t.table_name,+ 'comment' VALUE tc.comments,+ 'fields' VALUE NVL((+ SELECT JSON_ARRAYAGG(JSON_OBJECT(+ 'name' VALUE c.column_name,+ 'type' VALUE CASE+ WHEN c.data_type = 'NUMBER' AND c.data_precision IS NULL AND c.data_scale = 0 THEN 'INTEGER'+ WHEN c.data_type LIKE 'TIMESTAMP%' THEN 'TIMESTAMP'+ WHEN c.data_type LIKE 'INTERVAL%' THEN 'INTERVAL'+ WHEN c.data_type IN ('BINARY_FLOAT', 'BINARY_DOUBLE') THEN 'FLOAT'+ ELSE c.data_type END,+ 'size' VALUE CASE+ WHEN c.data_type IN ('VARCHAR2', 'NVARCHAR2', 'CHAR', 'NCHAR') THEN TO_CHAR(c.char_length)+ WHEN c.data_type = 'RAW' THEN TO_CHAR(c.data_length)+ WHEN c.data_type = 'NUMBER' AND c.data_precision IS NOT NULL+ THEN c.data_precision || CASE WHEN c.data_scale > 0 THEN ',' || c.data_scale END+ WHEN c.data_type = 'FLOAT' THEN TO_CHAR(c.data_precision)+ END,+ 'default' VALUE '',+ 'primary' VALUE CASE WHEN EXISTS (+ SELECT 1 FROM user_constraints pk JOIN user_cons_columns pc ON pc.constraint_name = pk.constraint_name+ WHERE pk.table_name = c.table_name AND pk.constraint_type = 'P' AND pc.column_name = c.column_name+ ) THEN 1 ELSE 0 END,+ 'unique' VALUE CASE WHEN EXISTS (+ SELECT 1 FROM user_indexes ui JOIN user_ind_columns uc ON uc.index_name = ui.index_name+ WHERE ui.table_name = c.table_name AND ui.uniqueness = 'UNIQUE' AND ui.index_type = 'NORMAL'+ AND uc.column_name = c.column_name+ AND (SELECT COUNT(*) FROM user_ind_columns k WHERE k.index_name = ui.index_name) = 1+ AND NOT EXISTS (SELECT 1 FROM user_constraints pk WHERE pk.constraint_type = 'P'+ AND pk.table_name = c.table_name AND pk.index_name = ui.index_name)+ ) THEN 1 ELSE 0 END,+ 'notNull' VALUE CASE WHEN c.nullable = 'N' THEN 1 ELSE 0 END,+ 'increment' VALUE CASE WHEN EXISTS (+ SELECT 1 FROM user_tab_identity_cols ic+ WHERE ic.table_name = c.table_name AND ic.column_name = c.column_name+ ) THEN 1 ELSE 0 END,+ 'comment' VALUE cc.comments+ RETURNING CLOB) ORDER BY c.column_id RETURNING CLOB)+ FROM user_tab_columns c+ LEFT JOIN user_col_comments cc ON cc.table_name = c.table_name AND cc.column_name = c.column_name+ WHERE c.table_name = t.table_name+ ), '[]') FORMAT JSON,+ 'indices' VALUE NVL((+ SELECT JSON_ARRAYAGG(JSON_OBJECT(+ 'name' VALUE i.index_name,+ 'unique' VALUE CASE WHEN i.uniqueness = 'UNIQUE' THEN 1 ELSE 0 END,+ 'fields' VALUE (SELECT JSON_ARRAYAGG(ic.column_name ORDER BY ic.column_position RETURNING CLOB)+ FROM user_ind_columns ic WHERE ic.index_name = i.index_name) FORMAT JSON+ RETURNING CLOB) ORDER BY i.index_name RETURNING CLOB)+ FROM user_indexes i+ WHERE i.table_name = t.table_name AND i.index_type = 'NORMAL'+ AND NOT EXISTS (SELECT 1 FROM user_constraints pk WHERE pk.constraint_type = 'P'+ AND pk.table_name = t.table_name AND pk.index_name = i.index_name)+ AND NOT (i.uniqueness = 'UNIQUE'+ AND (SELECT COUNT(*) FROM user_ind_columns k WHERE k.index_name = i.index_name) = 1)+ ), '[]') FORMAT JSON+ RETURNING CLOB) ORDER BY t.table_name RETURNING CLOB)+ FROM user_tables t+ LEFT JOIN user_tab_comments tc ON tc.table_name = t.table_name+ WHERE t.nested = 'NO' AND t.secondary = 'N' AND t.dropped = 'NO' AND t.iot_type IS NULL+ AND t.table_name NOT IN (SELECT mview_name FROM user_mviews)+ ), '[]') FORMAT JSON,+ 'relationships' VALUE NVL((+ SELECT JSON_ARRAYAGG(JSON_OBJECT(+ 'name' VALUE r.constraint_name,+ 'startTableName' VALUE r.table_name,+ 'startFieldNames' VALUE (SELECT JSON_ARRAYAGG(rc.column_name ORDER BY rc.position RETURNING CLOB)+ FROM user_cons_columns rc WHERE rc.constraint_name = r.constraint_name) FORMAT JSON,+ 'endTableName' VALUE p.table_name,+ 'endFieldNames' VALUE (SELECT JSON_ARRAYAGG(pc.column_name ORDER BY pc.position RETURNING CLOB)+ FROM user_cons_columns pc WHERE pc.constraint_name = p.constraint_name) FORMAT JSON,+ 'cardinality' VALUE CASE WHEN EXISTS (+ SELECT 1 FROM user_indexes ui+ WHERE ui.table_name = r.table_name AND ui.uniqueness = 'UNIQUE' AND ui.index_type = 'NORMAL'+ AND (SELECT LISTAGG(k.column_name, ',') WITHIN GROUP (ORDER BY k.column_name)+ FROM user_ind_columns k WHERE k.index_name = ui.index_name)+ = (SELECT LISTAGG(k.column_name, ',') WITHIN GROUP (ORDER BY k.column_name)+ FROM user_cons_columns k WHERE k.constraint_name = r.constraint_name)+ ) THEN 'one_to_one' ELSE 'many_to_one' END,+ 'deleteConstraint' VALUE CASE r.delete_rule WHEN 'CASCADE' THEN 'Cascade'+ WHEN 'SET NULL' THEN 'Set null' ELSE 'No action' END,+ 'updateConstraint' VALUE 'No action'+ RETURNING CLOB) ORDER BY r.constraint_name RETURNING CLOB)+ FROM user_constraints r+ JOIN user_constraints p ON p.constraint_name = r.r_constraint_name AND p.owner = r.r_owner+ WHERE r.constraint_type = 'R' AND r.r_owner = USER+ ), '[]') FORMAT JSON,+ 'enums' VALUE '[]' FORMAT JSON,+ 'skipped' VALUE JSON_OBJECT(+ 'views' VALUE (SELECT COUNT(*) FROM user_views),+ 'indexes' VALUE (SELECT COUNT(*) FROM user_indexes WHERE index_type LIKE 'FUNCTION-BASED%'),+ 'checks' VALUE (SELECT COUNT(*) FROM user_constraints+ WHERE constraint_type = 'C' AND search_condition_vc NOT LIKE '% IS NOT NULL')+ )+ RETURNING CLOB+) AS drawdb_schema FROM dual;`;++export const oraclesql = {+ query,+ minVersion: "Oracle 12.2",+ note: "schema_query_oracle_note",+ cli: "printf 'SET LONG 2000000000 LONGCHUNKSIZE 32767 LINESIZE 32767 PAGESIZE 0 FEEDBACK OFF HEADING OFF TRIMSPOOL ON\\[email protected]\\nexit\\n' | sqlplus -s <user>/<password>@<database> > drawdb-schema.json",+};diff --git a/src/utils/importFrom/schemaQuery/postgres.js b/src/utils/importFrom/schemaQuery/postgres.jsnew file mode 100644index 00000000..7012dbb6--- /dev/null+++ b/src/utils/importFrom/schemaQuery/postgres.js@@ -0,0 +1,121 @@+const query = `WITH+tbl AS (+ SELECT c.oid, c.relname, n.nspname,+ CASE WHEN n.nspname = 'public' THEN c.relname ELSE n.nspname || '.' || c.relname END AS name+ FROM pg_class c+ JOIN pg_namespace n ON n.oid = c.relnamespace+ WHERE c.relkind IN ('r', 'p') AND NOT c.relispartition+ AND n.nspname NOT LIKE 'pg\\_%' AND n.nspname <> 'information_schema'+),+col AS (+ SELECT t.oid AS relid, a.attnum, a.attname,+ a.attndims > 0 OR ty.typcategory = 'A' AS is_array,+ COALESCE(el.typname, ty.typname) AS typname,+ COALESCE(el.typtype, ty.typtype) AS typtype,+ COALESCE(eln.nspname, tyn.nspname) AS typnsp,+ substring(format_type(a.atttypid, a.atttypmod) FROM '\\(([^)]*)\\)') AS size,+ a.attnotnull, a.attidentity <> '' AS is_identity,+ pg_get_expr(d.adbin, d.adrelid) AS default_expr,+ col_description(t.oid, a.attnum) AS comment+ FROM tbl t+ JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum > 0 AND NOT a.attisdropped+ JOIN pg_type ty ON ty.oid = a.atttypid+ JOIN pg_namespace tyn ON tyn.oid = ty.typnamespace+ LEFT JOIN pg_type el ON el.oid = ty.typelem AND ty.typcategory = 'A'+ LEFT JOIN pg_namespace eln ON eln.oid = el.typnamespace+ LEFT JOIN pg_attrdef d ON d.adrelid = t.oid AND d.adnum = a.attnum+),+idx AS (+ SELECT i.indrelid AS relid, ic.relname AS name, i.indisunique, i.indisprimary,+ i.indkey::int2[] AS keys+ FROM pg_index i+ JOIN pg_class ic ON ic.oid = i.indexrelid+ WHERE i.indrelid IN (SELECT oid FROM tbl) AND i.indexprs IS NULL AND i.indpred IS NULL+),+fk AS (+ SELECT con.conname, con.conrelid, con.confrelid, con.conkey, con.confkey,+ con.confdeltype, con.confupdtype+ FROM pg_constraint con+ WHERE con.contype = 'f' AND con.conrelid IN (SELECT oid FROM tbl)+ AND con.confrelid IN (SELECT oid FROM tbl)+)+SELECT json_build_object(+ 'tables', (SELECT COALESCE(json_agg(json_build_object(+ 'name', t.name,+ 'comment', COALESCE(obj_description(t.oid, 'pg_class'), ''),+ 'fields', (SELECT COALESCE(json_agg(json_build_object(+ 'name', c.attname,+ 'type', CASE+ WHEN c.typtype = 'e' THEN upper(CASE WHEN c.typnsp = 'public' THEN c.typname ELSE c.typnsp || '.' || c.typname END)+ WHEN c.typname = 'int2' THEN 'SMALLINT'+ WHEN c.typname = 'int4' THEN 'INTEGER'+ WHEN c.typname = 'int8' THEN 'BIGINT'+ WHEN c.typname = 'float4' THEN 'REAL'+ WHEN c.typname = 'float8' THEN 'DOUBLE PRECISION'+ WHEN c.typname = 'bool' THEN 'BOOLEAN'+ WHEN c.typname = 'bpchar' THEN 'CHAR'+ ELSE upper(c.typname) END,+ 'size', CASE WHEN c.typtype = 'e' THEN '' ELSE COALESCE(c.size, '') END,+ 'isArray', c.is_array,+ 'default', CASE+ WHEN c.default_expr IS NULL OR c.default_expr LIKE 'nextval(%' THEN ''+ ELSE regexp_replace(+ regexp_replace(c.default_expr, '::[a-z_ ."]+(\\(\\d+(,\\d+)?\\))?(\\[\\])*$', '', 'i'),+ '^''(.*)''$', '\\1') END,+ 'primary', EXISTS (SELECT 1 FROM idx WHERE idx.relid = c.relid AND idx.indisprimary AND c.attnum = ANY (idx.keys)),+ 'unique', EXISTS (SELECT 1 FROM idx WHERE idx.relid = c.relid AND idx.indisunique AND NOT idx.indisprimary AND cardinality(idx.keys) = 1 AND c.attnum = ANY (idx.keys)),+ 'notNull', c.attnotnull,+ 'increment', c.is_identity OR COALESCE(c.default_expr LIKE 'nextval(%', false),+ 'comment', COALESCE(c.comment, '')+ ) ORDER BY c.attnum), '[]') FROM col c WHERE c.relid = t.oid),+ 'indices', (SELECT COALESCE(json_agg(json_build_object(+ 'name', i.name,+ 'unique', i.indisunique,+ 'fields', (SELECT json_agg(a.attname ORDER BY k.ord)+ FROM unnest(i.keys) WITH ORDINALITY k(attnum, ord)+ JOIN pg_attribute a ON a.attrelid = i.relid AND a.attnum = k.attnum)+ ) ORDER BY i.name), '[]') FROM idx i+ WHERE i.relid = t.oid AND NOT i.indisprimary+ AND NOT (i.indisunique AND cardinality(i.keys) = 1))+ ) ORDER BY t.name), '[]') FROM tbl t),+ 'relationships', (SELECT COALESCE(json_agg(json_build_object(+ 'name', f.conname,+ 'startTableName', st.name,+ 'startFieldNames', (SELECT json_agg(a.attname ORDER BY k.ord)+ FROM unnest(f.conkey) WITH ORDINALITY k(attnum, ord)+ JOIN pg_attribute a ON a.attrelid = f.conrelid AND a.attnum = k.attnum),+ 'endTableName', et.name,+ 'endFieldNames', (SELECT json_agg(a.attname ORDER BY k.ord)+ FROM unnest(f.confkey) WITH ORDINALITY k(attnum, ord)+ JOIN pg_attribute a ON a.attrelid = f.confrelid AND a.attnum = k.attnum),+ 'cardinality', CASE WHEN EXISTS (+ SELECT 1 FROM idx WHERE idx.relid = f.conrelid AND idx.indisunique+ AND idx.keys::int2[] @> f.conkey AND idx.keys::int2[] <@ f.conkey)+ THEN 'one_to_one' ELSE 'many_to_one' END,+ 'deleteConstraint', CASE f.confdeltype WHEN 'r' THEN 'Restrict' WHEN 'c' THEN 'Cascade'+ WHEN 'n' THEN 'Set null' WHEN 'd' THEN 'Set default' ELSE 'No action' END,+ 'updateConstraint', CASE f.confupdtype WHEN 'r' THEN 'Restrict' WHEN 'c' THEN 'Cascade'+ WHEN 'n' THEN 'Set null' WHEN 'd' THEN 'Set default' ELSE 'No action' END+ ) ORDER BY f.conname), '[]')+ FROM fk f JOIN tbl st ON st.oid = f.conrelid JOIN tbl et ON et.oid = f.confrelid),+ 'enums', (SELECT COALESCE(json_agg(json_build_object(+ 'name', CASE WHEN n.nspname = 'public' THEN ty.typname ELSE n.nspname || '.' || ty.typname END,+ 'values', (SELECT json_agg(e.enumlabel ORDER BY e.enumsortorder) FROM pg_enum e WHERE e.enumtypid = ty.oid)+ ) ORDER BY ty.typname), '[]')+ FROM pg_type ty JOIN pg_namespace n ON n.oid = ty.typnamespace+ WHERE ty.typtype = 'e' AND n.nspname NOT LIKE 'pg\\_%' AND n.nspname <> 'information_schema'),+ 'skipped', json_build_object(+ 'views', (SELECT count(*) FROM pg_class c JOIN pg_namespace n ON n.oid = c.relnamespace+ WHERE c.relkind IN ('v', 'm') AND n.nspname NOT LIKE 'pg\\_%' AND n.nspname <> 'information_schema'),+ 'indexes', (SELECT count(*) FROM pg_index i+ WHERE i.indrelid IN (SELECT oid FROM tbl) AND (i.indexprs IS NOT NULL OR i.indpred IS NOT NULL)),+ 'checks', (SELECT count(*) FROM pg_constraint con+ WHERE con.contype = 'c' AND con.conrelid IN (SELECT oid FROM tbl))+ )+) AS drawdb_schema;`;++export const postgres = {+ query,+ minVersion: "PostgreSQL 9.4",+ cli: "psql -At -d <database> -f drawdb-schema.sql > drawdb-schema.json",+};diff --git a/src/utils/importFrom/schemaQuery/sqlite.js b/src/utils/importFrom/schemaQuery/sqlite.jsnew file mode 100644index 00000000..a2d8b6f0--- /dev/null+++ b/src/utils/importFrom/schemaQuery/sqlite.js@@ -0,0 +1,104 @@+const query = String.raw`WITH+tbl AS (+ SELECT name, sql FROM sqlite_master+ WHERE type = 'table' AND name NOT LIKE 'sqlite!_%' ESCAPE '!'+),+col AS (+ SELECT t.name AS tname, t.sql AS tsql, c.cid, c.name, c."notnull" AS nn, c.dflt_value, c.pk,+ upper(trim(CASE WHEN instr(c.type, '(') > 0 THEN substr(c.type, 1, instr(c.type, '(') - 1) ELSE c.type END)) AS base,+ CASE WHEN instr(c.type, '(') > 0+ THEN replace(substr(c.type, instr(c.type, '(') + 1, instr(c.type, ')') - instr(c.type, '(') - 1), ' ', '')+ ELSE '' END AS size+ FROM tbl t, pragma_table_info(t.name) c+),+idx AS (+ SELECT t.name AS tname, il."unique" AS uq, il.origin, il.partial,+ CASE WHEN il.name LIKE 'sqlite!_autoindex!_%' ESCAPE '!'+ THEN t.name || '_' || (SELECT group_concat(name, '_') FROM (SELECT name FROM pragma_index_info(il.name) ORDER BY seqno)) || '_key'+ ELSE il.name END AS iname,+ (SELECT count(*) FROM pragma_index_info(il.name)) AS n,+ (SELECT count(*) FROM pragma_index_info(il.name) WHERE cid = -2) AS exprs,+ (SELECT min(name) FROM pragma_index_info(il.name)) AS first_col,+ (SELECT json_group_array(name) FROM (SELECT name FROM pragma_index_info(il.name) ORDER BY seqno)) AS cols,+ (SELECT group_concat(name) FROM (SELECT name FROM pragma_index_info(il.name) ORDER BY name)) AS col_set+ FROM tbl t, pragma_index_list(t.name) il+),+fk AS (+ SELECT t.name AS tname, f.id, f."table" AS rtable, f.on_update, f.on_delete,+ (SELECT json_group_array(f2."from") FROM (SELECT "from" FROM pragma_foreign_key_list(t.name)+ WHERE id = f.id ORDER BY seq) f2) AS start_cols,+ (SELECT json_group_array(coalesce(f2."to",+ (SELECT p.name FROM pragma_table_info(f2."table") p WHERE p.pk = f2.seq + 1)))+ FROM (SELECT "to", "table", seq FROM pragma_foreign_key_list(t.name) WHERE id = f.id ORDER BY seq) f2) AS end_cols,+ (SELECT group_concat(f2."from") FROM (SELECT "from" FROM pragma_foreign_key_list(t.name)+ WHERE id = f.id ORDER BY "from") f2) AS col_set+ FROM tbl t, pragma_foreign_key_list(t.name) f+ WHERE f.seq = 0+)+SELECT json_object(+ 'tables', (SELECT json_group_array(json_object(+ 'name', t.name,+ 'comment', '',+ 'fields', (SELECT json_group_array(json(j)) FROM (SELECT json_object(+ 'name', c.name,+ 'type', CASE+ WHEN c.base IN ('INT', 'INTEGER', 'TINYINT', 'SMALLINT', 'MEDIUMINT', 'BIGINT', 'INT2', 'INT8', 'UNSIGNED BIG INT') THEN 'INTEGER'+ WHEN c.base IN ('CHAR', 'CHARACTER', 'VARCHAR', 'VARYING CHARACTER', 'NCHAR', 'NATIVE CHARACTER', 'NVARCHAR') THEN 'VARCHAR'+ WHEN c.base IN ('TEXT', 'CLOB', 'JSON', 'UUID') THEN 'TEXT'+ WHEN c.base IN ('REAL', 'DOUBLE', 'DOUBLE PRECISION', 'FLOAT') THEN 'REAL'+ WHEN c.base IN ('NUMERIC', 'DECIMAL') THEN 'NUMERIC'+ WHEN c.base IN ('BOOLEAN', 'BOOL') THEN 'BOOLEAN'+ WHEN c.base IN ('DATE', 'DATETIME', 'TIME', 'TIMESTAMP', 'BLOB') THEN c.base+ WHEN c.base = '' THEN 'BLOB'+ WHEN c.base LIKE '%INT%' THEN 'INTEGER'+ WHEN c.base LIKE '%CHAR%' OR c.base LIKE '%CLOB%' OR c.base LIKE '%TEXT%' THEN 'TEXT'+ WHEN c.base LIKE '%BLOB%' THEN 'BLOB'+ WHEN c.base LIKE '%REAL%' OR c.base LIKE '%FLOA%' OR c.base LIKE '%DOUB%' THEN 'REAL'+ ELSE 'NUMERIC' END,+ 'size', CASE WHEN c.base IN ('CHAR', 'CHARACTER', 'VARCHAR', 'VARYING CHARACTER', 'NCHAR',+ 'NATIVE CHARACTER', 'NVARCHAR', 'NUMERIC', 'DECIMAL') THEN c.size ELSE '' END,+ 'default', CASE+ WHEN c.dflt_value IS NULL OR upper(c.dflt_value) = 'NULL' THEN ''+ WHEN c.dflt_value LIKE '''%''' THEN replace(substr(c.dflt_value, 2, length(c.dflt_value) - 2), '''''', '''')+ ELSE c.dflt_value END,+ 'primary', c.pk > 0,+ 'unique', EXISTS (SELECT 1 FROM idx WHERE idx.tname = c.tname AND idx.uq AND idx.n = 1+ AND idx.origin <> 'pk' AND idx.partial = 0 AND idx.first_col = c.name),+ 'notNull', c.nn = 1,+ 'increment', c.pk = 1 AND c.base = 'INTEGER' AND upper(c.tsql) LIKE '%AUTOINCREMENT%',+ 'comment', ''+ ) AS j FROM col c WHERE c.tname = t.name ORDER BY c.cid)),+ 'indices', (SELECT json_group_array(json_object(+ 'name', i.iname, 'unique', i.uq = 1, 'fields', json(i.cols)+ )) FROM idx i WHERE i.tname = t.name AND i.origin <> 'pk' AND i.partial = 0 AND i.exprs = 0+ AND NOT (i.uq AND i.n = 1))+ )) FROM (SELECT * FROM tbl ORDER BY name) t),+ 'relationships', (SELECT json_group_array(json_object(+ 'name', 'fk_' || fk.tname || '_' || fk.id,+ 'startTableName', fk.tname,+ 'startFieldNames', json(fk.start_cols),+ 'endTableName', fk.rtable,+ 'endFieldNames', json(fk.end_cols),+ 'cardinality', CASE WHEN EXISTS (SELECT 1 FROM idx WHERE idx.tname = fk.tname AND idx.uq+ AND idx.partial = 0 AND idx.col_set = fk.col_set)+ OR fk.col_set = (SELECT group_concat(name) FROM (SELECT name FROM col+ WHERE col.tname = fk.tname AND col.pk > 0 ORDER BY name))+ THEN 'one_to_one' ELSE 'many_to_one' END,+ 'deleteConstraint', CASE fk.on_delete WHEN 'CASCADE' THEN 'Cascade' WHEN 'SET NULL' THEN 'Set null'+ WHEN 'SET DEFAULT' THEN 'Set default' WHEN 'RESTRICT' THEN 'Restrict' ELSE 'No action' END,+ 'updateConstraint', CASE fk.on_update WHEN 'CASCADE' THEN 'Cascade' WHEN 'SET NULL' THEN 'Set null'+ WHEN 'SET DEFAULT' THEN 'Set default' WHEN 'RESTRICT' THEN 'Restrict' ELSE 'No action' END+ )) FROM fk),+ 'enums', json_array(),+ 'skipped', json_object(+ 'views', (SELECT count(*) FROM sqlite_master WHERE type = 'view'),+ 'indexes', (SELECT count(*) FROM idx WHERE idx.partial = 1 OR idx.exprs > 0),+ 'checks', (SELECT coalesce(sum((length(sql) - length(replace(upper(sql), 'CHECK', ''))) / 5), 0) FROM tbl)+ )+) AS drawdb_schema;`;++export const sqlite = {+ query,+ minVersion: "SQLite 3.38",+ cli: "sqlite3 <database-file> < drawdb-schema.sql > drawdb-schema.json",+};diff --git a/src/utils/issues.js b/src/utils/issues.jsindex 19988bec..67b216bd 100644--- a/src/utils/issues.js+++ b/src/utils/issues.js@@ -4,6 +4,7 @@ import { isFunction } from "./utils";function checkDefault(field, database) {if (field.default === "") return true;+ if (field.isArray) return true;if (isFunction(field.default)) return true;if (!field.notNull &&diff --git a/src/utils/modalData.js b/src/utils/modalData.jsindex f1b29a61..47a5cb45 100644--- a/src/utils/modalData.js+++ b/src/utils/modalData.js@@ -7,6 +7,8 @@ export const getModalTitle = (modal) => {return i18n.t("import_diagram");case MODAL.IMPORT_SRC:return i18n.t("import_from_source");+ case MODAL.IMPORT_DB:+ return i18n.t("import_from_database");case MODAL.CODE:return i18n.t("export");case MODAL.IMG:@@ -17,8 +19,6 @@ export const getModalTitle = (modal) => {return i18n.t("open_diagram");case MODAL.SAVEAS:return i18n.t("save_as");- case MODAL.NEW:- return i18n.t("create_new_diagram");case MODAL.LANGUAGE:return i18n.t("language");case MODAL.SHARE:@@ -33,8 +33,9 @@ export const getModalWidth = (modal) => {case MODAL.LANGUAGE:case MODAL.OPEN:case MODAL.CODE:- case MODAL.NEW:return 740;+ case MODAL.IMPORT_DB:+ return 1280;default:return 600;}@@ -44,6 +45,7 @@ export const getOkText = (modal) => {switch (modal) {case MODAL.IMPORT:case MODAL.IMPORT_SRC:+ case MODAL.IMPORT_DB:return i18n.t("import");case MODAL.CODE:case MODAL.IMG:@@ -54,8 +56,6 @@ export const getOkText = (modal) => {return i18n.t("open");case MODAL.SAVEAS:return i18n.t("save_as");- case MODAL.NEW:- return i18n.t("create");case MODAL.SHARE:return i18n.t("share");default: