Free, simple, and intuitive online database diagram editor and SQL generator.
JavaScript databasedatabase-designdatabase-diagramdatabase-schemadbmldiagram-editoreditorer-diagramerderdiagramindexeddbmariadbmcporacle-databaseoracle-dbpostgresqlschema-designsqlsql-serversqlite
Move all type data to datatypes.js
1ilit9c31e2be5245
diff --git a/src/components/EditorHeader/ControlPanel.jsx b/src/components/EditorHeader/ControlPanel.jsxindex d3e97c9a..ecf378f0 100644--- a/src/components/EditorHeader/ControlPanel.jsx+++ b/src/components/EditorHeader/ControlPanel.jsx@@ -94,6 +94,7 @@ export default function ControlPanel({setRelationships,addRelationship,deleteRelationship,+ database,} = useTables();const { types, addType, deleteType, updateType, setTypes } = useTypes();const { notes, setNotes, updateNote, addNote, deleteNote } = useNotes();@@ -858,6 +859,7 @@ export default function ControlPanel({tables: tables,references: relationships,types: types,+ database: database,});setExportData((prev) => ({...prev,@@ -873,6 +875,7 @@ export default function ControlPanel({tables: tables,references: relationships,types: types,+ database: database,});setExportData((prev) => ({...prev,@@ -888,6 +891,7 @@ export default function ControlPanel({tables: tables,references: relationships,types: types,+ database: database,});setExportData((prev) => ({...prev,@@ -903,6 +907,7 @@ export default function ControlPanel({tables: tables,references: relationships,types: types,+ database: database,});setExportData((prev) => ({...prev,@@ -918,6 +923,7 @@ export default function ControlPanel({tables: tables,references: relationships,types: types,+ database: database,});setExportData((prev) => ({...prev,diff --git a/src/components/EditorSidePanel/Issues.jsx b/src/components/EditorSidePanel/Issues.jsxindex 6e975cd5..61335fda 100644--- a/src/components/EditorSidePanel/Issues.jsx+++ b/src/components/EditorSidePanel/Issues.jsx@@ -9,7 +9,7 @@ export default function Issues() {const { types } = useTypes();const { t } = useTranslation();const { settings } = useSettings();- const { tables, relationships } = useTables();+ const { tables, relationships, database } = useTables();const [issues, setIssues] = useState([]);useEffect(() => {@@ -18,6 +18,7 @@ export default function Issues() {tables: tables,relationships: relationships,types: types,+ database: database,});if (!arrayIsEqual(newIssues, issues)) {@@ -26,7 +27,7 @@ export default function Issues() {};findIssues();- }, [tables, relationships, issues, types]);+ }, [tables, relationships, issues, types, database]);return (<Collapse keepDOM lazyRender style={{ width: "100%" }}>diff --git a/src/components/EditorSidePanel/TablesTab/FieldDetails.jsx b/src/components/EditorSidePanel/TablesTab/FieldDetails.jsxindex 82b4a498..35ba97b8 100644--- a/src/components/EditorSidePanel/TablesTab/FieldDetails.jsx+++ b/src/components/EditorSidePanel/TablesTab/FieldDetails.jsx@@ -9,13 +9,13 @@ import {} from "@douyinfe/semi-ui";import { Action, ObjectType } from "../../../data/constants";import { IconDeleteStroked } from "@douyinfe/semi-icons";-import { hasCheck, hasPrecision, isSized } from "../../../utils/toSQL";import { useTables, useUndoRedo } from "../../../hooks";import { useTranslation } from "react-i18next";+import { dbToTypes } from "../../../data/datatypes";export default function FieldDetails({ data, tid, index }) {const { t } = useTranslation();- const { tables } = useTables();+ const { tables, database } = useTables();const { setUndoStack, setRedoStack } = useUndoRedo();const { updateField, deleteField } = useTables();const [editField, setEditField] = useState({});@@ -99,7 +99,7 @@ export default function FieldDetails({ data, tid, index }) {/></>)}- {isSized(data.type) && (+ {dbToTypes[database][data.type].isSized && (<><div className="font-semibold">{t("size")}</div><InputNumber@@ -131,7 +131,7 @@ export default function FieldDetails({ data, tid, index }) {/></>)}- {hasPrecision(data.type) && (+ {dbToTypes[database][data.type].hasPrecision && (<><div className="font-semibold">{t("precision")}</div><Input@@ -168,7 +168,7 @@ export default function FieldDetails({ data, tid, index }) {/></>)}- {hasCheck(data.type) && (+ {dbToTypes[database][data.type].hasCheck && (<><div className="font-semibold">{t("check")}</div><Inputdiff --git a/src/components/EditorSidePanel/TablesTab/TableField.jsx b/src/components/EditorSidePanel/TablesTab/TableField.jsxindex 94401187..c5b6ac41 100644--- a/src/components/EditorSidePanel/TablesTab/TableField.jsx+++ b/src/components/EditorSidePanel/TablesTab/TableField.jsx@@ -1,7 +1,6 @@import { Action, ObjectType } from "../../../data/constants";import { Row, Col, Input, Button, Popover, Select } from "@douyinfe/semi-ui";import { IconMore, IconKeyStroked } from "@douyinfe/semi-icons";-import { getSize, hasCheck, hasPrecision, isSized } from "../../../utils/toSQL";import { useTables, useTypes, useUndoRedo } from "../../../hooks";import { useState } from "react";import FieldDetails from "./FieldDetails";@@ -51,7 +50,7 @@ export default function TableField({ data, tid, index }) {<SelectclassName="w-full"optionList={[- ...dbToTypes[database].map((value) => ({+ ...Object.keys(dbToTypes[database]).map((value) => ({label: value,value: value,})),@@ -93,10 +92,13 @@ export default function TableField({ data, tid, index }) {values: data.values ? [...data.values] : [],increment: incr,});- } else if (isSized(value) || hasPrecision(value)) {+ } else if (+ dbToTypes[database][value].isSized ||+ dbToTypes[database][value].hasPrecision+ ) {updateField(tid, index, {type: value,- size: getSize(value),+ size: dbToTypes[database][value].defaultSize,increment: incr,});} else if (@@ -113,7 +115,7 @@ export default function TableField({ data, tid, index }) {size: "",values: [],});- } else if (hasCheck(value)) {+ } else if (dbToTypes[database][value].hasCheck) {updateField(tid, index, {type: value,check: "",diff --git a/src/components/EditorSidePanel/TypesTab/TypeField.jsx b/src/components/EditorSidePanel/TypesTab/TypeField.jsxindex b7128b3c..83c6cbaa 100644--- a/src/components/EditorSidePanel/TypesTab/TypeField.jsx+++ b/src/components/EditorSidePanel/TypesTab/TypeField.jsx@@ -11,7 +11,6 @@ import {Popover,} from "@douyinfe/semi-ui";import { IconDeleteStroked, IconMore } from "@douyinfe/semi-icons";-import { isSized, hasPrecision, getSize } from "../../../utils/toSQL";import { useUndoRedo, useTypes, useTables } from "../../../hooks";import { useTranslation } from "react-i18next";import { dbToTypes } from "../../../data/datatypes";@@ -64,7 +63,7 @@ export default function TypeField({ data, tid, fid }) {<SelectclassName="w-full"optionList={[- ...dbToTypes[database].map((value) => ({+ ...Object.keys(dbToTypes[database]).map((value) => ({label: value,value: value,})),@@ -112,11 +111,14 @@ export default function TypeField({ data, tid, fid }) {: e,),});- } else if (isSized(value) || hasPrecision(value)) {+ } else if (+ dbToTypes[database][value].isSized ||+ dbToTypes[database][value].hasPrecision+ ) {updateType(tid, {fields: types[tid].fields.map((e, id) =>id === fid- ? { ...data, type: value, size: getSize(value) }+ ? { ...data, type: value, size: dbToTypes[database][value].defaultSize }: e,),});@@ -184,7 +186,7 @@ export default function TypeField({ data, tid, fid }) {/></>)}- {isSized(data.type) && (+ {dbToTypes[database][data.type].isSized && (<><div className="font-semibold">{t("size")}</div><InputNumber@@ -222,7 +224,7 @@ export default function TypeField({ data, tid, fid }) {/></>)}- {hasPrecision(data.type) && (+ {dbToTypes[database][data.type].hasPrecision && (<><div className="font-semibold">{t("precision")}</div><Inputdiff --git a/src/data/datatypes.js b/src/data/datatypes.jsindex 5596902d..df748a10 100644--- a/src/data/datatypes.js+++ b/src/data/datatypes.js@@ -1,280 +1,451 @@-export const defaultTypes = [- "INT",- "SMALLINT",- "BIGINT",- "DECIMAL",- "NUMERIC",- "FLOAT",- "DOUBLE",- "REAL",- "CHAR",- "VARCHAR",- "TEXT",- "DATE",- "TIME",- "TIMESTAMP",- "DATETIME",- "BOOLEAN",- "BINARY",- "VARBINARY",- "BLOB",- "JSON",- "UUID",- "ENUM",- "SET",-];--export const mysqlTypes = [- // Numeric Data Types- "TINYINT",- "SMALLINT",- "MEDIUMINT",- "INT",- "INTEGER",- "BIGINT",- "DECIMAL",- "NUMERIC",- "FLOAT",- "DOUBLE",- "BIT",- "BOOLEAN",-- // Date and Time Data Types- "DATE",- "DATETIME",- "TIMESTAMP",- "TIME",- "YEAR",-- // String Data Types- "CHAR",- "VARCHAR",- "BINARY",- "VARBINARY",- "TINYBLOB",- "BLOB",- "MEDIUMBLOB",- "LONGBLOB",- "TINYTEXT",- "TEXT",- "MEDIUMTEXT",- "LONGTEXT",- "ENUM",- "SET",-- // Spatial Data Types- "GEOMETRY",- "POINT",- "LINESTRING",- "POLYGON",- "MULTIPOINT",- "MULTILINESTRING",- "MULTIPOLYGON",- "GEOMETRYCOLLECTION",-- // JSON Data Type- "JSON",-];--export const postgresTypes = [- // Numeric Data Types- "SMALLINT",- "INTEGER",- "BIGINT",- "DECIMAL",- "NUMERIC",- "REAL",- "DOUBLE PRECISION",- "SMALLSERIAL",- "SERIAL",- "BIGSERIAL",- "MONEY",-- // Character Types- "CHARACTER",- "CHAR",- "VARCHAR",- "TEXT",-- // Binary Data Types- "BYTEA",-- // Date and Time Types- "DATE",- "TIME",- "TIMESTAMP",- "TIMESTAMPTZ",- "INTERVAL",-- // Boolean Type- "BOOLEAN",-- // Enumerated Types- "ENUM",-- // Geometric Types- "POINT",- "LINE",- "LSEG",- "BOX",- "PATH",- "POLYGON",- "CIRCLE",-- // Network Address Types- "CIDR",- "INET",- "MACADDR",- "MACADDR8",-- // Bit String Types- "BIT",- "VARBIT",-- // Text Search Types- "TSVECTOR",- "TSQUERY",-- // JSON Types- "JSON",- "JSONB",-- // UUID Type- "UUID",-- // XML Type- "XML",-- // Arrays- "ARRAY",-];--export const sqliteTypes = [- // Numeric Data Types- "INTEGER",- "REAL",-- // Text Data Types- "TEXT",-- // Blob Data Type- "BLOB",-- // Affinity Types- "NUMERIC",-- // Boolean Type (Alias of INTEGER)- "BOOLEAN",-- // Date and Time Types (Recommended to store as TEXT)- "DATE",- "DATETIME",- "TIME",- "TIMESTAMP",-];--export const mariadbTypes = [- // Numeric Data Types- "TINYINT",- "SMALLINT",- "MEDIUMINT",- "INT",- "INTEGER",- "BIGINT",- "DECIMAL",- "NUMERIC",- "FLOAT",- "DOUBLE",- "BIT",- "BOOLEAN",-- // Date and Time Data Types- "DATE",- "DATETIME",- "TIMESTAMP",- "TIME",- "YEAR",-- // String Data Types- "CHAR",- "VARCHAR",- "BINARY",- "VARBINARY",- "TINYBLOB",- "BLOB",- "MEDIUMBLOB",- "LONGBLOB",- "TINYTEXT",- "TEXT",- "MEDIUMTEXT",- "LONGTEXT",- "ENUM",- "SET",-- // Spatial Data Types- "GEOMETRY",- "POINT",- "LINESTRING",- "POLYGON",- "MULTIPOINT",- "MULTILINESTRING",- "MULTIPOLYGON",- "GEOMETRYCOLLECTION",-- // JSON Data Type- "JSON",-];--export const mssqlTypes = [- // Exact Numeric Data Types- "BIGINT",- "INT",- "SMALLINT",- "TINYINT",- "BIT",- "DECIMAL",- "NUMERIC",- "MONEY",- "SMALLMONEY",-- // Approximate Numeric Data Types- "FLOAT",- "REAL",-- // Date and Time Data Types- "DATE",- "TIME",- "DATETIME",- "DATETIME2",- "DATETIMEOFFSET",- "SMALLDATETIME",- "TIMESTAMP",+import { strHasQuotes } from "../utils/utils";++const intRegex = /^-?\d*$/;+const doubleRegex = /^-?\d*.?\d+$/;+const binaryRegex = /^[01]+$/;++/* eslint-disable no-unused-vars */+export const defaultTypes = {+ INT: {+ type: "INT",+ checkDefault: (field) => {+ return intRegex.test(field.default);+ },+ hasCheck: true,+ isSized: false,+ hasPrecision: false,+ defaultSize: null,+ },+ SMALLINT: {+ type: "SMALLINT",+ checkDefault: (field) => {+ return intRegex.test(field.default);+ },+ hasCheck: true,+ isSized: false,+ hasPrecision: false,+ defaultSize: null,+ },+ BIGINT: {+ type: "BIGINT",+ checkDefault: (field) => {+ return intRegex.test(field.default);+ },+ isSized: false,+ hasCheck: true,+ hasPrecision: false,+ defaultSize: null,+ },+ DECIMAL: {+ type: "DECIMAL",+ checkDefault: (field) => {+ return doubleRegex.test(field.default);+ },+ hasCheck: true,+ isSized: false,+ hasPrecision: true,+ defaultSize: null,+ },+ NUMERIC: {+ type: "NUMERIC",+ checkDefault: (field) => {+ return doubleRegex.test(field.default);+ },+ hasCheck: true,+ isSized: false,+ hasPrecision: true,+ defaultSize: null,+ },+ FLOAT: {+ type: "FLOAT",+ checkDefault: (field) => {+ return doubleRegex.test(field.default);+ },+ hasCheck: true,+ isSized: false,+ hasPrecision: true,+ defaultSize: null,+ },+ DOUBLE: {+ type: "DOUBLE",+ checkDefault: (field) => {+ return doubleRegex.test(field.default);+ },+ hasCheck: true,+ isSized: false,+ hasPrecision: true,+ defaultSize: null,+ },+ REAL: {+ type: "REAL",+ checkDefault: (field) => {+ return doubleRegex.test(field.default);+ },+ hasCheck: true,+ isSized: false,+ hasPrecision: false,+ defaultSize: null,+ },+ CHAR: {+ type: "CHAR",+ checkDefault: (field) => {+ if (strHasQuotes(field.default)) {+ return field.default.length - 2 <= field.size;+ }+ return field.default.length <= field.size;+ },+ hasCheck: true,+ isSized: true,+ hasPrecision: false,+ defaultSize: 1,+ },+ VARCHAR: {+ type: "VARCHAR",+ checkDefault: (field) => {+ if (strHasQuotes(field.default)) {+ return field.default.length - 2 <= field.size;+ }+ return field.default.length <= field.size;+ },+ hasCheck: true,+ isSized: true,+ hasPrecision: false,+ defaultSize: 255,+ },+ TEXT: {+ type: "TEXT",+ checkDefault: (field) => false,+ hasCheck: false,+ isSized: true,+ hasPrecision: false,+ defaultSize: 65535,+ },+ DATE: {+ type: "DATE",+ checkDefault: (field) => {+ return /^\d{4}-\d{2}-\d{2}$/.test(field.default);+ },+ hasCheck: false,+ isSized: false,+ hasPrecision: false,+ defaultSize: null,+ },+ TIME: {+ type: "TIME",+ checkDefault: (field) => {+ return /^(?:[01]?\d|2[0-3]):[0-5]?\d:[0-5]?\d$/.test(field.default);+ },+ hasCheck: false,+ isSized: false,+ hasPrecision: false,+ defaultSize: null,+ },+ TIMESTAMP: {+ type: "TIMESTAMP",+ checkDefault: (field) => {+ if (field.default.toUpperCase() === "CURRENT_TIMESTAMP") {+ return true;+ }+ if (!/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(field.default)) {+ return false;+ }+ const content = field.default.split(" ");+ const date = content[0].split("-");+ return parseInt(date[0]) >= 1970 && parseInt(date[0]) <= 2038;+ },+ hasCheck: false,+ isSized: false,+ hasPrecision: false,+ defaultSize: null,+ },+ DATETIME: {+ type: "DATETIME",+ checkDefault: (field) => {+ if (field.default.toUpperCase() === "CURRENT_TIMESTAMP") {+ return true;+ }+ if (!/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(field.default)) {+ return false;+ }+ const c = field.default.split(" ");+ const d = c[0].split("-");+ return parseInt(d[0]) >= 1000 && parseInt(d[0]) <= 9999;+ },+ hasCheck: false,+ isSized: false,+ hasPrecision: false,+ defaultSize: null,+ },+ BOOLEAN: {+ type: "BOOLEAN",+ checkDefault: (field) => {+ return (+ field.default.trim().toLowerCase() === "false" ||+ field.default.trim().toLowerCase() === "true"+ );+ },+ hasCheck: false,+ isSized: false,+ hasPrecision: false,+ defaultSize: null,+ },+ BINARY: {+ type: "BINARY",+ checkDefault: (field) => {+ return (+ field.default.length <= field.size && binaryRegex.test(field.default)+ );+ },+ hasCheck: false,+ isSized: true,+ hasPrecision: false,+ defaultSize: 1,+ },+ VARBINARY: {+ type: "VARBINARY",+ checkDefault: (field) => {+ return (+ field.default.length <= field.size && binaryRegex.test(field.default)+ );+ },+ hasCheck: false,+ isSized: true,+ hasPrecision: false,+ defaultSize: 255,+ },+ BLOB: {+ type: "BLOB",+ checkDefault: (field) => false,+ isSized: false,+ hasCheck: false,+ hasPrecision: false,+ defaultSize: null,+ },+ JSON: {+ type: "JSON",+ checkDefault: (field) => false,+ isSized: false,+ hasCheck: false,+ hasPrecision: false,+ defaultSize: null,+ },+ UUID: {+ type: "UUID",+ checkDefault: (field) => false,+ isSized: false,+ hasCheck: false,+ hasPrecision: false,+ defaultSize: null,+ },+ ENUM: {+ type: "ENUM",+ checkDefault: (field) => {+ return field.values.includes(field.default);+ },+ hasCheck: false,+ isSized: false,+ hasPrecision: false,+ defaultSize: null,+ },+ SET: {+ type: "SET",+ checkDefault: (field) => {+ const defaultValues = field.default.split(",");+ for (let i = 0; i < defaultValues.length; i++) {+ if (!field.values.includes(defaultValues[i].trim())) return false;+ }+ return true;+ },+ hasCheck: false,+ isSized: false,+ hasPrecision: false,+ defaultSize: null,+ },+};- // Character Strings- "CHAR",- "VARCHAR",- "TEXT",+export const mysqlTypes = {+ TINYINT: { type: "TINYINT", checkDefault: (field) => {} },+ SMALLINT: { type: "SMALLINT", checkDefault: (field) => {} },+ MEDIUMINT: { type: "MEDIUMINT", checkDefault: (field) => {} },+ INT: { type: "INT", checkDefault: (field) => {} },+ INTEGER: { type: "INTEGER", checkDefault: (field) => {} },+ BIGINT: { type: "BIGINT", checkDefault: (field) => {} },+ DECIMAL: { type: "DECIMAL", checkDefault: (field) => {} },+ NUMERIC: { type: "NUMERIC", checkDefault: (field) => {} },+ FLOAT: { type: "FLOAT", checkDefault: (field) => {} },+ DOUBLE: { type: "DOUBLE", checkDefault: (field) => {} },+ BIT: { type: "BIT", checkDefault: (field) => {} },+ BOOLEAN: { type: "BOOLEAN", checkDefault: (field) => {} },+ DATE: { type: "DATE", checkDefault: (field) => {} },+ DATETIME: { type: "DATETIME", checkDefault: (field) => {} },+ TIMESTAMP: { type: "TIMESTAMP", checkDefault: (field) => {} },+ TIME: { type: "TIME", checkDefault: (field) => {} },+ YEAR: { type: "YEAR", checkDefault: (field) => {} },+ CHAR: { type: "CHAR", checkDefault: (field) => {} },+ VARCHAR: { type: "VARCHAR", checkDefault: (field) => {} },+ BINARY: { type: "BINARY", checkDefault: (field) => {} },+ VARBINARY: { type: "VARBINARY", checkDefault: (field) => {} },+ TINYBLOB: { type: "TINYBLOB", checkDefault: (field) => {} },+ BLOB: { type: "BLOB", checkDefault: (field) => {} },+ MEDIUMBLOB: { type: "MEDIUMBLOB", checkDefault: (field) => {} },+ LONGBLOB: { type: "LONGBLOB", checkDefault: (field) => {} },+ TINYTEXT: { type: "TINYTEXT", checkDefault: (field) => {} },+ TEXT: { type: "TEXT", checkDefault: (field) => {} },+ MEDIUMTEXT: { type: "MEDIUMTEXT", checkDefault: (field) => {} },+ LONGTEXT: { type: "LONGTEXT", checkDefault: (field) => {} },+ ENUM: { type: "ENUM", checkDefault: (field) => {} },+ SET: { type: "SET", checkDefault: (field) => {} },+ GEOMETRY: { type: "GEOMETRY", checkDefault: (field) => {} },+ POINT: { type: "POINT", checkDefault: (field) => {} },+ LINESTRING: { type: "LINESTRING", checkDefault: (field) => {} },+ POLYGON: { type: "POLYGON", checkDefault: (field) => {} },+ MULTIPOINT: { type: "MULTIPOINT", checkDefault: (field) => {} },+ MULTILINESTRING: { type: "MULTILINESTRING", checkDefault: (field) => {} },+ MULTIPOLYGON: { type: "MULTIPOLYGON", checkDefault: (field) => {} },+ GEOMETRYCOLLECTION: {+ type: "GEOMETRYCOLLECTION",+ checkDefault: (field) => {},+ },+ JSON: { type: "JSON", checkDefault: (field) => {} },+};- // Unicode Character Strings- "NCHAR",- "NVARCHAR",- "NTEXT",+export const postgresTypes = {+ SMALLINT: { type: "SMALLINT", checkDefault: (field) => {} },+ INTEGER: { type: "INTEGER", checkDefault: (field) => {} },+ BIGINT: { type: "BIGINT", checkDefault: (field) => {} },+ DECIMAL: { type: "DECIMAL", checkDefault: (field) => {} },+ NUMERIC: { type: "NUMERIC", checkDefault: (field) => {} },+ REAL: { type: "REAL", checkDefault: (field) => {} },+ "DOUBLE PRECISION": { type: "DOUBLE PRECISION", checkDefault: (field) => {} },+ SMALLSERIAL: { type: "SMALLSERIAL", checkDefault: (field) => {} },+ SERIAL: { type: "SERIAL", checkDefault: (field) => {} },+ BIGSERIAL: { type: "BIGSERIAL", checkDefault: (field) => {} },+ MONEY: { type: "MONEY", checkDefault: (field) => {} },+ CHARACTER: { type: "CHARACTER", checkDefault: (field) => {} },+ CHAR: { type: "CHAR", checkDefault: (field) => {} },+ VARCHAR: { type: "VARCHAR", checkDefault: (field) => {} },+ TEXT: { type: "TEXT", checkDefault: (field) => {} },+ BYTEA: { type: "BYTEA", checkDefault: (field) => {} },+ DATE: { type: "DATE", checkDefault: (field) => {} },+ TIME: { type: "TIME", checkDefault: (field) => {} },+ TIMESTAMP: { type: "TIMESTAMP", checkDefault: (field) => {} },+ TIMESTAMPTZ: { type: "TIMESTAMPTZ", checkDefault: (field) => {} },+ INTERVAL: { type: "INTERVAL", checkDefault: (field) => {} },+ BOOLEAN: { type: "BOOLEAN", checkDefault: (field) => {} },+ ENUM: { type: "ENUM", checkDefault: (field) => {} },+ POINT: { type: "POINT", checkDefault: (field) => {} },+ LINE: { type: "LINE", checkDefault: (field) => {} },+ LSEG: { type: "LSEG", checkDefault: (field) => {} },+ BOX: { type: "BOX", checkDefault: (field) => {} },+ PATH: { type: "PATH", checkDefault: (field) => {} },+ POLYGON: { type: "POLYGON", checkDefault: (field) => {} },+ CIRCLE: { type: "CIRCLE", checkDefault: (field) => {} },+ CIDR: { type: "CIDR", checkDefault: (field) => {} },+ INET: { type: "INET", checkDefault: (field) => {} },+ MACADDR: { type: "MACADDR", checkDefault: (field) => {} },+ MACADDR8: { type: "", checkDefault: (field) => {} },+ BIT: { type: "", checkDefault: (field) => {} },+ VARBIT: { type: "", checkDefault: (field) => {} },+ TSVECTOR: { type: "", checkDefault: (field) => {} },+ TSQUERY: { type: "", checkDefault: (field) => {} },+ JSON: { type: "", checkDefault: (field) => {} },+ JSONB: { type: "", checkDefault: (field) => {} },+ UUID: { type: "", checkDefault: (field) => {} },+ XML: { type: "", checkDefault: (field) => {} },+ ARRAY: { type: "", checkDefault: (field) => {} },+};- // Binary Data Types- "BINARY",- "VARBINARY",- "IMAGE",+export const sqliteTypes = {+ INTEGER: { type: "INTEGER", checkDefault: (field) => {} },+ REAL: { type: "REAL", checkDefault: (field) => {} },+ TEXT: { type: "TEXT", checkDefault: (field) => {} },+ BLOB: { type: "BLOB", checkDefault: (field) => {} },+ NUMERIC: { type: "NUMERIC", checkDefault: (field) => {} },+ BOOLEAN: { type: "BOOLEAN", checkDefault: (field) => {} },+ DATE: { type: "DATE", checkDefault: (field) => {} },+ DATETIME: { type: "DATETIME", checkDefault: (field) => {} },+ TIME: { type: "TIME", checkDefault: (field) => {} },+ TIMESTAMP: { type: "TIMESTAMP", checkDefault: (field) => {} },+};- // Other Data Types- "UNIQUEIDENTIFIER",- "XML",- "CURSOR",- "TABLE",- "SQL_VARIANT",+export const mariadbTypes = {+ TINYINT: { type: " ", checkDefault: (field) => {} },+ SMALLINT: { type: "", checkDefault: (field) => {} },+ MEDIUMINT: { type: "", checkDefault: (field) => {} },+ INT: { type: "", checkDefault: (field) => {} },+ INTEGER: { type: "", checkDefault: (field) => {} },+ BIGINT: { type: "", checkDefault: (field) => {} },+ DECIMAL: { type: "", checkDefault: (field) => {} },+ NUMERIC: { type: "", checkDefault: (field) => {} },+ FLOAT: { type: "", checkDefault: (field) => {} },+ DOUBLE: { type: "", checkDefault: (field) => {} },+ BIT: { type: "", checkDefault: (field) => {} },+ BOOLEAN: { type: "", checkDefault: (field) => {} },+ DATE: { type: "", checkDefault: (field) => {} },+ DATETIME: { type: "", checkDefault: (field) => {} },+ TIMESTAMP: { type: "", checkDefault: (field) => {} },+ TIME: { type: "", checkDefault: (field) => {} },+ YEAR: { type: "", checkDefault: (field) => {} },+ CHAR: { type: "", checkDefault: (field) => {} },+ VARCHAR: { type: "", checkDefault: (field) => {} },+ BINARY: { type: "", checkDefault: (field) => {} },+ VARBINARY: { type: "", checkDefault: (field) => {} },+ TINYBLOB: { type: "", checkDefault: (field) => {} },+ BLOB: { type: "", checkDefault: (field) => {} },+ MEDIUMBLOB: { type: "", checkDefault: (field) => {} },+ LONGBLOB: { type: "", checkDefault: (field) => {} },+ TINYTEXT: { type: "", checkDefault: (field) => {} },+ TEXT: { type: "", checkDefault: (field) => {} },+ MEDIUMTEXT: { type: "", checkDefault: (field) => {} },+ LONGTEXT: { type: "", checkDefault: (field) => {} },+ ENUM: { type: "", checkDefault: (field) => {} },+ SET: { type: "", checkDefault: (field) => {} },+ GEOMETRY: { type: "", checkDefault: (field) => {} },+ POINT: { type: "", checkDefault: (field) => {} },+ LINESTRING: { type: "", checkDefault: (field) => {} },+ POLYGON: { type: "", checkDefault: (field) => {} },+ MULTIPOINT: { type: "", checkDefault: (field) => {} },+ MULTILINESTRING: { type: "", checkDefault: (field) => {} },+ MULTIPOLYGON: { type: "", checkDefault: (field) => {} },+ GEOMETRYCOLLECTION: { type: "", checkDefault: (field) => {} },+ JSON: { type: "", checkDefault: (field) => {} },+};- // JSON Data Type- "JSON", // Note: JSON is not a native type in MSSQL; it uses NVARCHAR to store JSON data-];+export const mssqlTypes = {+ BIGINT: { type: "", checkDefault: (field) => {} },+ INT: { type: "", checkDefault: (field) => {} },+ SMALLINT: { type: "", checkDefault: (field) => {} },+ TINYINT: { type: "", checkDefault: (field) => {} },+ BIT: { type: "", checkDefault: (field) => {} },+ DECIMAL: { type: "", checkDefault: (field) => {} },+ NUMERIC: { type: "", checkDefault: (field) => {} },+ MONEY: { type: "", checkDefault: (field) => {} },+ SMALLMONEY: { type: "", checkDefault: (field) => {} },+ FLOAT: { type: "", checkDefault: (field) => {} },+ REAL: { type: "", checkDefault: (field) => {} },+ DATE: { type: "", checkDefault: (field) => {} },+ TIME: { type: "", checkDefault: (field) => {} },+ DATETIME: { type: "", checkDefault: (field) => {} },+ DATETIME2: { type: "", checkDefault: (field) => {} },+ DATETIMEOFFSET: { type: "", checkDefault: (field) => {} },+ SMALLDATETIME: { type: "", checkDefault: (field) => {} },+ TIMESTAMP: { type: "", checkDefault: (field) => {} },+ CHAR: { type: "", checkDefault: (field) => {} },+ VARCHAR: { type: "", checkDefault: (field) => {} },+ TEXT: { type: "", checkDefault: (field) => {} },+ NCHAR: { type: "", checkDefault: (field) => {} },+ NVARCHAR: { type: "", checkDefault: (field) => {} },+ NTEXT: { type: "", checkDefault: (field) => {} },+ BINARY: { type: "", checkDefault: (field) => {} },+ VARBINARY: { type: "", checkDefault: (field) => {} },+ IMAGE: { type: "", checkDefault: (field) => {} },+ UNIQUEIDENTIFIER: { type: "", checkDefault: (field) => {} },+ XML: { type: "", checkDefault: (field) => {} },+ CURSOR: { type: "", checkDefault: (field) => {} },+ TABLE: { type: "", checkDefault: (field) => {} },+ SQL_VARIANT: { type: "", checkDefault: (field) => {} },+ JSON: { type: "", checkDefault: (field) => {} },+};const dbToTypesBase = {generic: defaultTypes,diff --git a/src/utils/issues.js b/src/utils/issues.jsindex d7cde0f5..f24a3dd5 100644--- a/src/utils/issues.js+++ b/src/utils/issues.js@@ -1,86 +1,15 @@+import { dbToTypes } from "../data/datatypes";import i18n from "../i18n/i18n";-import { isFunction, strHasQuotes } from "./utils";+import { isFunction } from "./utils";-function validateDateStr(str) {- return /^(?!0000)(?!00)(?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-9]|3[01])|(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31))$/.test(- str,- );-}--function checkDefault(field) {+function checkDefault(field, database) {if (field.default === "") return true;if (isFunction(field.default)) return true;if (!field.notNull && field.default.toLowerCase() === "null") return true;- switch (field.type) {- case "INT":- case "BIGINT":- case "SMALLINT":- return /^-?\d*$/.test(field.default);- case "SET": {- const defaultValues = field.default.split(",");- for (let i = 0; i < defaultValues.length; i++) {- if (!field.values.includes(defaultValues[i].trim())) return false;- }- return true;- }- case "ENUM":- return field.values.includes(field.default);- case "CHAR":- case "VARCHAR":- if (strHasQuotes(field.default)) {- return field.default.length - 2 <= field.size;- }- return field.default.length <= field.size;- case "BINARY":- case "VARBINARY":- return (- field.default.length <= field.size && /^[01]+$/.test(field.default)- );- case "BOOLEAN":- return (- field.default.trim().toLowerCase() === "false" ||- field.default.trim().toLowerCase() === "true"- );- case "FLOAT":- case "DECIMAL":- case "DOUBLE":- case "NUMERIC":- case "REAL":- return /^-?\d*.?\d+$/.test(field.default);- case "DATE":- return validateDateStr(field.default);- case "TIME":- return /^(?:[01]?\d|2[0-3]):[0-5]?\d:[0-5]?\d$/.test(field.default);- case "TIMESTAMP": {- if (field.default.toUpperCase() === "CURRENT_TIMESTAMP") {- return true;- }- if (!/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(field.default)) {- return false;- }- const content = field.default.split(" ");- const date = content[0].split("-");-- return parseInt(date[0]) >= 1970 && parseInt(date[0]) <= 2038;- }- case "DATETIME": {- if (field.default.toUpperCase() === "CURRENT_TIMESTAMP") {- return true;- }- if (!/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(field.default)) {- return false;- }- const c = field.default.split(" ");- const d = c[0].split("-");-- return parseInt(d[0]) >= 1000 && parseInt(d[0]) <= 9999;- }- default:- return true;- }+ return dbToTypes[database][field.type].checkDefault(field);}export function getIssues(diagram) {@@ -123,7 +52,7 @@ export function getIssues(diagram) {}}- if (!checkDefault(field)) {+ if (!checkDefault(field, diagram.database)) {issues.push(i18n.t("default_doesnt_match_type", {tableName: table.name,diff --git a/src/utils/toSQL.js b/src/utils/toSQL.jsindex 5369488a..58acaf1c 100644--- a/src/utils/toSQL.js+++ b/src/utils/toSQL.js@@ -1,8 +1,8 @@-import { defaultTypes } from "../data/datatypes";+import { dbToTypes, defaultTypes } from "../data/datatypes";import { isFunction, isKeyword, strHasQuotes } from "./utils";export function getJsonType(f) {- if (!defaultTypes.includes(f.type)) {+ if (!Object.keys(defaultTypes).includes(f.type)) {return '{ "type" : "object", additionalProperties : true }';}switch (f.type) {@@ -39,18 +39,26 @@ export function generateSchema(type) {)}\n\t\t\t},\n\t\t\t"additionalProperties": false\n\t\t}`;}-export function getTypeString(field, dbms = "mysql", baseType = false) {+export function getTypeString(+ field,+ currentDb,+ dbms = "mysql",+ baseType = false,+) {if (dbms === "mysql") {if (field.type === "UUID") {return `VARCHAR(36)`;}- if (hasPrecision(field.type) || isSized(field.type)) {+ if (+ dbToTypes[currentDb][field.type].isSized ||+ dbToTypes[currentDb][field.type].hasPrecision+ ) {return `${field.type}${field.size ? `(${field.size})` : ""}`;}if (field.type === "SET" || field.type === "ENUM") {return `${field.type}(${field.values.map((v) => `"${v}"`).join(", ")})`;}- if (!defaultTypes.includes(field.type)) {+ if (!Object.keys(defaultTypes).includes(field.type)) {return "JSON";}return field.type;@@ -76,7 +84,7 @@ export function getTypeString(field, dbms = "mysql", baseType = false) {if (field.type === "DATETIME") {return `timestamp`;}- if (isSized(field.type)) {+ if (dbToTypes[currentDb][field.type].isSized) {const type =field.type === "BINARY"? "bit"@@ -85,7 +93,7 @@ export function getTypeString(field, dbms = "mysql", baseType = false) {: field.type.toLowerCase();return `${type}(${field.size})`;}- if (hasPrecision(field.type) && field.size !== "") {+ if (dbToTypes[currentDb][field.type].hasPrecision && field.size !== "") {return `${field.type}${field.size}`;}return field.type.toLowerCase();@@ -121,7 +129,7 @@ export function getTypeString(field, dbms = "mysql", baseType = false) {type = field.type;break;}- if (isSized(field.type)) {+ if (dbToTypes[currentDb][field.type].isSized) {return `${type}(${field.size})`;}@@ -167,13 +175,14 @@ export function jsonToMySQL(obj) {(field) =>`${field.comment === "" ? "" : `\t-- ${field.comment}\n`}\t\`${field.name- }\` ${getTypeString(field)}${field.notNull ? " NOT NULL" : ""}${+ }\` ${getTypeString(field, obj.database)}${field.notNull ? " NOT NULL" : ""}${field.increment ? " AUTO_INCREMENT" : ""}${field.unique ? " UNIQUE" : ""}${field.default !== "" ? ` DEFAULT ${parseDefault(field)}` : ""}${- field.check === "" || !hasCheck(field.type)- ? !defaultTypes.includes(field.type)+ field.check === "" ||+ !dbToTypes[obj.database][field.type].hasCheck+ ? !Object.keys(defaultTypes).includes(field.type)? ` CHECK(\n\t\tJSON_SCHEMA_VALID("${generateSchema(obj.types.find((t) => t.name === field.type.toLowerCase(),@@ -181,7 +190,7 @@ export function jsonToMySQL(obj) {)}", \`${field.name}\`))`: "": ` CHECK(${field.check})`- }${field.comment ? ` COMMENT '${field.comment}'` : ''}`,+ }${field.comment ? ` COMMENT '${field.comment}'` : ""}`,).join(",\n")}${table.fields.filter((f) => f.primary).length > 0@@ -190,7 +199,7 @@ export function jsonToMySQL(obj) {.map((f) => `\`${f.name}\``).join(", ")})`: ""- }\n)${table.comment ? ` COMMENT='${table.comment}'` : ''};\n${+ }\n)${table.comment ? ` COMMENT='${table.comment}'` : ""};\n${table.indices.length > 0? `\n${table.indices.map((i) =>@@ -233,14 +242,16 @@ export function jsonToPostgreSQL(obj) {`${type.comment === "" ? "" : `/**\n${type.comment}\n*/\n`}CREATE TYPE ${type.name} AS (\n${type.fields- .map((f) => `\t${f.name} ${getTypeString(f, "postgres")}`)+ .map(+ (f) => `\t${f.name} ${getTypeString(f, obj.database, "postgres")}`,+ ).join("\n")}\n);`);} else {return `${type.comment === "" ? "" : `/**\n${type.comment}\n*/\n`}CREATE TYPE ${type.name} AS (\n${type.fields- .map((f) => `\t${f.name} ${getTypeString(f, "postgres")}`)+ .map((f) => `\t${f.name} ${getTypeString(f, obj.database, "postgres")}`).join("\n")}\n);`;}})}\n${obj.tables@@ -263,12 +274,13 @@ export function jsonToPostgreSQL(obj) {(field) =>`${field.comment === "" ? "" : `\t-- ${field.comment}\n`}\t"${field.name- }" ${getTypeString(field, "postgres")}${+ }" ${getTypeString(field, obj.database, "postgres")}${field.notNull ? " NOT NULL" : ""}${field.default !== "" ? ` DEFAULT ${parseDefault(field)}` : ""}${- field.check === "" || !hasCheck(field.type)+ field.check === "" ||+ !dbToTypes[obj.database][field.type].hasCheck? "": ` CHECK(${field.check})`}`,@@ -367,7 +379,8 @@ export function jsonToSQLite(obj) {}" ${getSQLiteType(field)}${field.notNull ? " NOT NULL" : ""}${field.unique ? " UNIQUE" : ""}${field.default !== "" ? ` DEFAULT ${parseDefault(field)}` : ""}${- field.check === "" || !hasCheck(field.type)+ field.check === "" ||+ !dbToTypes[obj.database][field.type].hasCheck? "": ` CHECK(${field.check})`}`,@@ -408,13 +421,14 @@ export function jsonToMariaDB(obj) {(field) =>`${field.comment === "" ? "" : `\t-- ${field.comment}\n`}\t\`${field.name- }\` ${getTypeString(field)}${field.notNull ? " NOT NULL" : ""}${+ }\` ${getTypeString(field, obj.database)}${field.notNull ? " NOT NULL" : ""}${field.increment ? " AUTO_INCREMENT" : ""}${field.unique ? " UNIQUE" : ""}${field.default !== "" ? ` DEFAULT ${parseDefault(field)}` : ""}${- field.check === "" || !hasCheck(field.type)- ? !defaultTypes.includes(field.type)+ field.check === "" ||+ !dbToTypes[obj.database][field.type].hasCheck+ ? !Object.keys(defaultTypes).includes(field.type)? ` CHECK(\n\t\tJSON_SCHEMA_VALID('${generateSchema(obj.types.find((t) => t.name === field.type.toLowerCase(),@@ -466,7 +480,7 @@ export function jsonToSQLServer(obj) {}CREATE TYPE [${type.name}] FROM ${type.fields.length < 0? ""- : `${getTypeString(type.fields[0], "mssql", true)}`+ : `${getTypeString(type.fields[0], obj.database, "mssql", true)}`};\nGO\n`;}).join("\n")}\n${obj.tables@@ -479,14 +493,15 @@ export function jsonToSQLServer(obj) {(field) =>`${field.comment === "" ? "" : `\t-- ${field.comment}\n`}\t[${field.name- }] ${getTypeString(field, "mssql")}${+ }] ${getTypeString(field, obj.database, "mssql")}${field.notNull ? " NOT NULL" : ""}${field.increment ? " IDENTITY" : ""}${field.unique ? " UNIQUE" : ""}${field.default !== "" ? ` DEFAULT ${parseDefault(field)}` : ""}${- field.check === "" || !hasCheck(field.type)+ field.check === "" ||+ !dbToTypes[obj.database][field.type].hasCheck? "": ` CHECK(${field.check})`}`,@@ -522,41 +537,3 @@ export function jsonToSQLServer(obj) {).join("\n")}`;}--export function isSized(type) {- return ["CHAR", "VARCHAR", "BINARY", "VARBINARY", "TEXT"].includes(type);-}--export function hasPrecision(type) {- return ["DOUBLE", "NUMERIC", "DECIMAL", "FLOAT"].includes(type);-}--export function hasCheck(type) {- return [- "INT",- "SMALLINT",- "BIGINT",- "CHAR",- "VARCHAR",- "FLOAT",- "DECIMAL",- "DOUBLE",- "NUMERIC",- "REAL",- ].includes(type);-}--export function getSize(type) {- switch (type) {- case "CHAR":- case "BINARY":- return 1;- case "VARCHAR":- case "VARBINARY":- return 255;- case "TEXT":- return 65535;- default:- return "";- }-}