Skip to content

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

Add examples (#1143)

1ilitf418c29eb216
diff --git a/src/components/EditorHeader/Modal/New.jsx b/src/components/EditorHeader/Modal/New.jsx
index 4c450264..572ba10f 100644
--- a/src/components/EditorHeader/Modal/New.jsx
+++ b/src/components/EditorHeader/Modal/New.jsx
@@ -3,6 +3,7 @@ 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 }) {
const { settings } = useSettings();
@@ -43,6 +44,7 @@ export default function New({ selectedTemplateId, setSelectedTemplateId }) {
<div className="text-center mt-1">{temp.title}</div>
</div>
))}
+ <Slot name="new-diagram-end" />
</div>
);
}
diff --git a/src/utils/dbml/parse.js b/src/utils/dbml/parse.js
index 736c0b43..23b2111b 100644
--- a/src/utils/dbml/parse.js
+++ b/src/utils/dbml/parse.js
@@ -31,13 +31,13 @@ function fieldDefault(column) {
return value === undefined || value === null ? "" : String(value);
}
-function parseField(column) {
+function parseField(column, primaryKeyColumns) {
return {
name: column.name,
type: baseTypeName(column.type).toUpperCase(),
size: column.type?.args ?? "",
default: fieldDefault(column),
- primary: !!column.pk,
+ primary: !!column.pk || primaryKeyColumns.has(column.name),
unique: !!column.unique,
notNull: !!column.not_null,
increment: !!column.increment,
@@ -46,16 +46,23 @@ function parseField(column) {
}
function parseTable(table) {
+ const compositeKey = table.indexes.find((index) => index.pk);
+ const primaryKeyColumns = new Set(
+ compositeKey?.columns.map((column) => column.value) ?? [],
+ );
+
return {
name: table.name,
comment: table.note ?? "",
color: table.headerColor ?? null,
- fields: table.fields.map(parseField),
- indices: table.indexes.map((index) => ({
- name: index.name ?? "",
- fields: index.columns.map((column) => column.value),
- unique: !!index.unique,
- })),
+ fields: table.fields.map((field) => parseField(field, primaryKeyColumns)),
+ indices: table.indexes
+ .filter((index) => !index.pk)
+ .map((index) => ({
+ name: index.name ?? "",
+ fields: index.columns.map((column) => column.value),
+ unique: !!index.unique,
+ })),
};
}
diff --git a/src/utils/exportSQL/oraclesql.js b/src/utils/exportSQL/oraclesql.js
index 82158513..b6776ba4 100644
--- a/src/utils/exportSQL/oraclesql.js
+++ b/src/utils/exportSQL/oraclesql.js
@@ -6,6 +6,17 @@ import {
getFkColumnNames,
} from "./shared";
+function oracleDeleteClause(constraint) {
+ switch (String(constraint).toLowerCase()) {
+ case "cascade":
+ return "\nON DELETE CASCADE";
+ case "set null":
+ return "\nON DELETE SET NULL";
+ default:
+ return "";
+ }
+}
+
function tablesToOracleSQL(diagram) {
return `${diagram.tables
.map(
@@ -32,7 +43,7 @@ function tablesToOracleSQL(diagram) {
!dbToTypes[diagram.database][field.type].hasCheck
? ""
: ` CHECK(${field.check})`
- }${field.comment ? ` -- ${field.comment}` : ""}`,
+ }`,
)
.join(",\n")}${
table.fields.filter((f) => f.primary).length > 0
@@ -41,7 +52,7 @@ function tablesToOracleSQL(diagram) {
.map((f) => `"${f.name}"`)
.join(", ")})`
: ""
- }${uniqueConstraintClause(table, (s) => `"${s}"`)}\n)${table.comment ? ` -- ${table.comment}` : ""};\n${`\n${table.indices
+ }${uniqueConstraintClause(table, (s) => `"${s}"`)}\n);\n${`\n${table.indices
.map(
(i) =>
`\nCREATE ${i.unique ? "UNIQUE " : ""}INDEX "${i.name}"\nON "${table.name}" (${i.fields
@@ -66,7 +77,7 @@ function tablesToOracleSQL(diagram) {
.map((c) => `"${c}"`)
.join(", ")}) REFERENCES "${endName}" (${endColumns
.map((c) => `"${c}"`)
- .join(", ")})\nON UPDATE ${r.updateConstraint.toUpperCase()} ON DELETE ${r.deleteConstraint.toUpperCase()};`;
+ .join(", ")})${oracleDeleteClause(r.deleteConstraint)};`;
})
.join("\n")}`;
}
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 4c7cb37e..6503f62a 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -42,6 +42,8 @@ const keywords = [
"CURRENT_TIMESTAMP",
"LOCALTIME",
"LOCALTIMESTAMP",
+ "SYSDATE",
+ "SYSTIMESTAMP",
];
export function isKeyword(str) {